R-2.15.1

Fixes #1675 dropdown not working in the "manage" button

.codecov.yml

@@ -0,0 +1,13 @@
+codecov:
+  branch: master
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+  status:
+    changes: false
+
+comment:
+  layout: "header, diff, changes"

.gitignore

@@ -13,6 +13,7 @@
 *.orig
 Thumbs.db
 .DS_Store
+*.DS_Store
 index.yaml
 routes.py
 logging.conf
@@ -48,7 +49,10 @@ applications/*/sessions/*
 applications/*/errors/*
 applications/*/cache/*
 applications/*/uploads/*
+applications/*/private/*
 applications/*/*.py[oc]
+applications/*/static/temp
+applications/*/progress.log
 applications/examples/static/epydoc
 applications/examples/static/sphinx
 applications/admin/cron/cron.master
@@ -56,3 +60,5 @@ HOWTO-web2py-devel
 *.sublime-project
 *.sublime-workspace
 .idea/*
+site-packages/
+logs/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "gluon/packages/dal"]
+	path = gluon/packages/dal
+	url = https://github.com/web2py/pydal.git

.travis.yml

@@ -1,57 +1,45 @@
 language: python
 
+sudo: required
+
+cache: pip
+
+dist: "trusty"
+
 python:
-  - '2.6'
   - '2.7'
-  - 'pypy'
+  - '3.5'
+  - '3.6'
+  - 'pypy-5.3.1'
+  - 'pypy3.5-5.7.1-beta'
+
+matrix:
+  allow_failures:
+    - python: 'pypy3.5-5.7.1-beta'
+
 install:
   - pip install -e .
-env:
-  - DB=sqlite:memory
-  - DB=mysql://root:@localhost/test_w2p
-  - DB=postgres://postgres:@localhost/test_w2p
-  - DB=google:datastore
-  - DB=mongodb://mongodb:mongodb@localhost/test_w2p
-  - DB=imap://imap:imap@localhost:993
+
 before_script:
-  - if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then pip install unittest2; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install coverage; fi;
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install python-coveralls; fi
-  - if [[ $DB == postgres* ]]; then pip install psycopg2; fi;
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install pysqlite; fi
-  - if [[ $DB == mysql* ]]; then mysql -e 'create database test_w2p;'; fi
-  - if [[ $DB == postgres* ]]; then psql -c 'create database test_w2p;' -U postgres; fi
-
-  # Install last sdk for app engine (update only whenever a new release is available)
-  - if [[ $DB == google* ]]; then wget http://googleappengine.googlecode.com/files/google_appengine_1.8.9.zip -nv; fi
-  - if [[ $DB == google* ]]; then unzip -q google_appengine_1.8.9.zip; fi
-  - if [[ $DB == google* ]]; then mv -f ./google_appengine/google ./google; fi
-
-  - if [[ $DB == mongodb* ]]; then pip install pymongo; fi
-  - if [[ $DB == mongodb* ]]; then mongo test_w2p --eval 'db.addUser("mongodb", "mongodb");'; fi
-
-  #Temporal solution to travis issue #155
-  - sudo chmod 777 /dev/shm
-  - sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm
-matrix:
-  exclude:
-    - python: 'pypy'
-      env: DB=postgres://postgres:@localhost/test_w2p
-    - python: 'pypy'
-      env: DB=mysql://root:@localhost/test_w2p
-    - python: 'pypy'
-      env: DB=google:datastore
-    - python: '2.6'
-      env: DB=google:datastore
+  - pip install coverage
+  - pip install codecov
+  - mysql -e 'create database pydal;'
+  - psql -c 'create database pydal;' -U postgres
+  - psql -c 'create extension postgis;' -U postgres -d pydal;
+  - psql -c 'SHOW SERVER_VERSION' -U postgres
 
 
 script: export COVERAGE_PROCESS_START=gluon/tests/coverage.ini; ./web2py.py --run_system_tests --with_coverage
+
 after_success:
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coverage combine; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls --config_file=gluon/tests/coverage.ini; fi
-  
+  - coverage combine;
+  - codecov
+
 notifications:
   email: true
 
-services: mongodb
-
+addons:
+  postgresql: "9.4"
+  apt:
+    packages:
+      - postgresql-9.4-postgis-2.3

CHANGELOG

@@ -1,3 +1,200 @@
+## 2.15.0b1
+- dropped support for python 2.6
+- dropped web shell
+- experimental python 3 support
+- experimental authapi for service login
+- allow ajax file uploads
+- more tests
+- more pep8 compliance
+- d3.js model visulization
+- improved scheduler
+- is_email support for internationalized Domain Names
+- improved used of cookies with CookieJar
+- SQLFORM.grid(showblobs=True)
+- import JS events (added w2p.componentBegin event)
+- added support for CASv3
+- allow first_name and last_name placeholders in verify_email message
+- added three-quote support in markmin
+- updated pg8000 driver (but we still recommend psycopg2)
+- compiled views use . separator not _ separator (must recompile code)
+- better serbian, french, and catalan translations
+- speed improvements (refactor of compileapp and pyc caching)
+- removed web shell (never worked as intended)
+- allow Expose(..., follow_symlink_out=False).
+- Updated fpdf to latest version
+- JWT support
+- import fabfile for remote deployment
+- scheduler new feature: you can now specify intervals with cron
+- gluon/* removed from sys.path. Applications relying on statements like e.g.
+  "from storage import Storage"
+  will need to be rewritten with
+  "from gluon.storage import Storage"
+- tests can only be run with the usual web2py.py --run_system_tests OR with
+  python -m unittest -v gluon.tests on the root dir
+- jQuery 3.2.1
+- PyDAL 17.07 including:
+  allow jsonb support for postgres
+  correctly configure adapters that need connection for configuration
+  better caching
+  updated IMAP adapter methods to new API
+  experimental suport for joinable subselects
+  improved Teradata support
+  improved mongodb support
+  overall refactoring
+  experimental support for Google Cloud SQL v2
+  new pymysql driver
+
+## 2.14.6
+
+- Increased test coverage (thanks Richard)
+- Fixed some newly discovered security issues in admin:
+  CSRF vulnerability in admin that allows disabling apps
+  Brute force password attack vulnerability in admin
+  (thanks Narendra and Leonel)
+
+## 2.14.1-5
+
+- fixed two major security issues that caused the examples app to leak information
+- new Auth(…,host_names=[…]) to prevent host header injection
+- improved scheduler
+- pep8 enhancements
+- many bug fixes
+- restored GAE support that was broken in 2.13.*
+- improved fabfile for deployment
+- refactored examples with stupid.css
+- new JWT implementation (experimental)
+- new gluon.contrib.redis_scheduler
+- myconf.get
+- LDAP groups (experimental)
+- .flash -> .w2p_flash
+- Updated feedparser.py 5.2.1
+- Updated jQuery 1.12.2
+- welcome app now checks for version number
+- Redis improvements. New syntax:
+
+    BEFORE:
+    from gluon.contrib.redis_cache import RedisCache
+    cache.redis = RedisCache('localhost:6379',db=None, debug=True)
+
+    NOW:
+    from gluon.contrib.redis_utils import RConn
+    from gluon.contrib.redis_cache import RedisCache
+    rconn = RConn()
+    # or RConn(host='localhost', port=6379,
+    # db=0, password=None, socket_timeout=None,
+    # socket_connect_timeout=None, .....)
+    # exactly as a redis.StrictRedis instance
+    cache.redis = RedisCache(redis_conn=rconn, debug=True)
+
+    BEFORE:
+    from gluon.contrib.redis_session import RedisSession
+    sessiondb = RedisSession('localhost:6379',db=0, session_expiry=False)
+    session.connect(request, response, db = sessiondb)
+
+    NOW:
+    from gluon.contrib.redis_utils import RConn
+    from gluon.contrib.redis_session import RedisSession
+    rconn = RConn()
+    sessiondb = RedisSession(redis_conn=rconn, session_expiry=False)
+    session.connect(request, response, db = sessiondb)
+
+Many thanks to Richard and Simone for their work and dedication.
+
+## 2.13.*
+
+- fixed a security issue in request_reset_password
+- added fabfile.py
+- fixed oauth2 renew token, thanks dokime7
+- fixed add_membership, del_membership, add_membership IntegrityError (when auth.enable_record_versioning)
+- allow passing unicode to template render
+- allow IS_NOT_IN_DB to work with custom primarykey, thanks timmyborg
+- allow HttpOnly cookies
+- french pluralizaiton rules, thanks Mathieu Clabaut
+- fixed bug in redirect to cas service, thanks Fernando González
+- allow deploying to pythonanywhere from the web2py admin that you're running locally, thanks Leonel
+- better tests
+- many more bug fixes
+
+## 2.12.1-3
+
+- security fix: Validate for open redirect everywhere, not just in login()
+- allow to pack invidual apps and selected files as packed exe files
+- allow bulk user registration with default bulk_register_enabled=False
+- allow unsorted multiword query in grid search
+- better MongoDB support with newer pyDAL
+- enable <app>/appadmin/manage/auth by default for user admin
+- allow mail.settings.server='logging:filename' to log emails to a file
+- better caching logic
+- fixed order of confirm-password field
+- TLS support in ldap
+- prettydate can do UTC
+- jquery 1.11.3
+- bootstrap 3.3.5
+- moved to codecov and enabled appveyor
+- many bug fixes
+
+## 2.11.1
+
+- Many small but significative improvements and bug fixes
+
+## 2.10.1-2.10.2
+
+- welcome app defaults to Bootstrap 3
+- DAL -> pyDAL (thanks Giovanni, Niphlod, Paolo)
+  - new modular dal
+  - fixed problems with GAE support
+  - moved to full NDB support
+  - improved connection pooling logic
+- optional cache.ram.max_ram_utilization = 90 (experimental)
+- improved cache.disk logic (thanks Niphlod and Leonel)
+- lots of pep8 improvements, thanks Richard
+- added support for email attchments when auth.settings.server='gae'
+- fixed app.yaml.example for GAE
+- fixed many small issues
+- many many more tests (thanks Giovanni, Niphlod, Paolo)
+- upgrading static libraries (bootstrap, codemirror, jquery, etc)
+
+## 2.9.12
+
+- Tornado HTTPS support, thanks Diego
+- Modular DAL, thanks Giovanni
+- Added coverage support, thanks Niphlod
+- More tests, thanks Niphlod and Paolo Valleri
+- Added support for show_if in readonly sqlform, thanks Paolo
+- Improved scheduler, thanks Niphlod
+- Email timeout support
+- Made web2py's custom_import work with circular imports, thanks Jack Kuan
+- Added Portuguese, Catalan, and Burmese translations
+- Allow map_hyphen to work for application names, thanks Tim Nyborg
+- New module appconfig.py, thanks Niphlod
+- Added geospatial support to Teradata adaptor, thanks Andrew Willimott
+- Many bug fixes
+
+
+
+## 2.9.6 - 2.9.10
+
+- fixed support of GAE + SQL
+- fixed a typo in the license of some login_methods code. It is now LGPL consistently with the rest of the web2py code. This change applied to all previous web2py versions.
+- support for SAML2 (with pysaml2)
+- Sphinx documentation (thanks Niphlod)
+- improved scheduler (thanks Niphlod)
+- increased security
+- better cache.disk (thanks Leonel)
+- sessions are stored in subfolders for speed
+- postgres support for "INSERT ... RETURING ..."
+- ldap support for Certificate Authority (thanks Maggs and Shane)
+- improved support for S/Mime X.509 (thanks Gyuris)
+- better welcome app
+- support for Collection+JSON Hypermedia API (RESTful self documenting API)
+- jQuery 1.11
+- codemirror 4.0.3
+- markdown2 2.2.3
+- memcache 1.53
+- support for the new janrain API
+- new "web2py.py -G config" to make GAE configuration easier
+- many small bug fixes
+
 ## 2.9.1 - 2.9.5
 
 - many small but important bug fixes

LICENSE

@@ -39,25 +39,6 @@ web2py contains third party software under the gluon/contrib/ folder.
 Each file/module in contrib is distributed with web2py under its original license.
 Here we list some of them.
 
-#### gluon.contrib.simplejson LICENSE
-
-Copyright (c) 2006 Bob Ippolito - 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.
-
 #### gluon.contrib.rss2.py (originally PyRSS2Gen) LICENSE
 
 This is copyright (c) by Dalke Scientific Software, LLC and released under the

Makefile

@@ -11,41 +11,41 @@ clean:
 	find ./ -name '*.rej' -exec rm -f {} \; 
 	find ./ -name '#*' -exec rm -f {} \;
 	find ./ -name 'Thumbs.db' -exec rm -f {} \; 
-	find ./gluon/ -name '.*' -exec rm -f {} \;
+	# find ./gluon/ -name '.*' -exec rm -f {} \;
 	find ./gluon/ -name '*class' -exec rm -f {} \; 
 	find ./applications/admin/ -name '.*' -exec rm -f {} \; 
 	find ./applications/examples/ -name '.*' -exec rm -f {} \; 
 	find ./applications/welcome/ -name '.*' -exec rm -f {} \; 
 	find ./ -name '*.pyc' -exec rm -f {} \;
-epydoc:
-	### build epydoc
-	rm -f -r applications/examples/static/epydoc/ 
-	epydoc --config extras/epydoc/epydoc.conf
-	cp applications/examples/static/title.png applications/examples/static/epydoc
 tests:
 	python web2py.py --run_system_tests
+coverage:
+	coverage erase --rcfile=gluon/tests/coverage.ini
+	export COVERAGE_PROCESS_START=gluon/tests/coverage.ini
+	python web2py.py --run_system_tests --with_coverage
+	coverage combine --rcfile=gluon/tests/coverage.ini
+	sleep 1
+	coverage html --rcfile=gluon/tests/coverage.ini
 update:
 	wget -O gluon/contrib/feedparser.py http://feedparser.googlecode.com/svn/trunk/feedparser/feedparser.py
 	wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.9.5-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.15.1-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
 	rm -f routes.py 
-	rm -f applications/*/sessions/*
-	rm -f applications/*/errors/* | echo 'too many files'
-	rm -f applications/*/cache/*
-	rm -f applications/admin/databases/*                 
-	rm -f applications/welcome/databases/*               
-	rm -f applications/examples/databases/*             
-	rm -f applications/admin/uploads/*                 
-	rm -f applications/welcome/uploads/*               
-	rm -f applications/examples/uploads/* 
-	### make epydoc
-	make epydoc
+	rm -rf applications/*/sessions/*
+	rm -rf applications/*/errors/* | echo 'too many files'
+	rm -rf applications/*/cache/*
+	rm -rf applications/admin/databases/*                 
+	rm -rf applications/welcome/databases/*               
+	rm -rf applications/examples/databases/*             
+	rm -rf applications/admin/uploads/*                 
+	rm -rf applications/welcome/uploads/*               
+	rm -rf applications/examples/uploads/* 
 	### make welcome layout and appadmin the default
 	cp applications/welcome/views/appadmin.html applications/admin/views
 	cp applications/welcome/views/appadmin.html applications/examples/views
@@ -54,7 +54,7 @@ src:
 	### build web2py_src.zip
 	echo '' > NEWINSTALL
 	mv web2py_src.zip web2py_src_old.zip | echo 'no old'
-	cd ..; zip -r web2py/web2py_src.zip web2py/web2py.py web2py/anyserver.py web2py/gluon/*.py web2py/gluon/contrib/* web2py/extras/* web2py/handlers/* web2py/examples/* web2py/README.markdown  web2py/LICENSE web2py/CHANGELOG web2py/NEWINSTALL web2py/VERSION web2py/MANIFEST.in web2py/scripts/*.sh web2py/scripts/*.py web2py/applications/admin web2py/applications/examples/ web2py/applications/welcome web2py/applications/__init__.py web2py/site-packages/__init__.py web2py/gluon/tests/*.sh web2py/gluon/tests/*.py
+	cd ..; zip -r web2py/web2py_src.zip web2py/web2py.py web2py/anyserver.py web2py/fabfile.py web2py/gluon/* web2py/extras/* web2py/handlers/* web2py/examples/* web2py/README.markdown  web2py/LICENSE web2py/CHANGELOG web2py/NEWINSTALL web2py/VERSION web2py/MANIFEST.in web2py/scripts/*.sh web2py/scripts/*.py web2py/applications/admin web2py/applications/examples/ web2py/applications/welcome web2py/applications/__init__.py web2py/site-packages/__init__.py web2py/gluon/tests/*.sh web2py/gluon/tests/*.py
 
 mdp:
 	make src
@@ -66,8 +66,8 @@ app:
 	#cd ../web2py_osx/site-packages/; unzip ../site-packages.zip
 	#find gluon -path '*.pyc' -exec cp {} ../web2py_osx/site-packages/{} \;
 	#cd ../web2py_osx/site-packages/; zip -r ../site-packages.zip *
-	#mv ../web2py_osx/site-packages.zip ../web2py_osx/web2py/web2py.app/Contents/Resources/lib/python2.7
-	find gluon -path '*.py' -exec cp -R {} ../web2py_osx/web2py/web2py.app/Contents/Resources/{} \;	
+	cp ../web2py_osx/site-packages.zip ../web2py_osx/web2py/web2py.app/Contents/Resources/lib/python2.7
+	find gluon -path '*.py' -exec cp -r --parents {} ../web2py_osx/web2py/web2py.app/Contents/Resources/ \;
 	cp README.markdown ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp NEWINSTALL ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp LICENSE ../web2py_osx/web2py/web2py.app/Contents/Resources
@@ -75,7 +75,6 @@ app:
 	cp CHANGELOG ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp -r extras ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp -r examples ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp -r handlers ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp -r applications/admin ../web2py_osx/web2py/web2py.app/Contents/Resources/applications
 	cp -r applications/welcome ../web2py_osx/web2py/web2py.app/Contents/Resources/applications
 	cp -r applications/examples ../web2py_osx/web2py/web2py.app/Contents/Resources/applications
@@ -84,22 +83,19 @@ app:
 		
 	mv ../web2py_osx/web2py_osx.zip .
 win:
-	python2.7 -c 'import compileall; compileall.compile_dir("gluon/")'
-	#cd ../web2py_win/library/; unzip ../library.zip
-	find gluon -path '*.pyc' -exec cp -R {} ../web2py_win/library/{} \;
-	cd ../web2py_win/library/; zip -r ../library.zip *
-	mv ../web2py_win/library.zip ../web2py_win/web2py
+	#cd ../web2py_win/library/; zip -r ../library.zip *
+	cp ../web2py_win/library.zip ../web2py_win/web2py
+	find gluon -path '*.py' -exec cp -r --parents {} ../web2py_win/web2py/ \;
 	cp README.markdown ../web2py_win/web2py/
 	cp NEWINSTALL ../web2py_win/web2py/
 	cp LICENSE ../web2py_win/web2py/
 	cp VERSION ../web2py_win/web2py/
 	cp CHANGELOG ../web2py_win/web2py/
-	cp -R extras ../web2py_win/web2py/
-	cp -R examples ../web2py_win/web2py/
-	cp -R handlers ../web2py_win/web2py/
-	cp -R applications/admin ../web2py_win/web2py/applications
-	cp -R applications/welcome ../web2py_win/web2py/applications
-	cp -R applications/examples ../web2py_win/web2py/applications
+	cp -r extras ../web2py_win/web2py/
+	cp -r examples ../web2py_win/web2py/
+	cp -r applications/admin ../web2py_win/web2py/applications
+	cp -r applications/welcome ../web2py_win/web2py/applications
+	cp -r applications/examples ../web2py_win/web2py/applications
 	cp applications/__init__.py ../web2py_win/web2py/applications
 	cd ../web2py_win; zip -r web2py_win.zip web2py
 	mv ../web2py_win/web2py_win.zip .

README.markdown

@@ -1,17 +1,47 @@
 ## Readme
 
-web2py is a free open source full-stack framework for rapid development of fast, scalable, secure and portable database-driven web-based applications. 
+web2py is a free open source full-stack framework for rapid development of fast, scalable, secure and portable database-driven web-based applications.
 
 It is written and programmable in Python. LGPLv3 License
 
 Learn more at http://web2py.com
 
+## Google App Engine deployment
+
+    cp examples/app.yaml ./
+    cp handlers/gaehandler.py ./
+
+Then edit ./app.yaml and replace "yourappname" with yourappname.
+
+## Important reminder about this GIT repo
+
+An important part of web2py is the Database Abstraction Layer (DAL). In early 2015 this was decoupled into a separate code-base (PyDAL). In terms of git, it is a sub-module of the main repository.
+
+The use of a sub-module requires a one-time use of the --recursive flag for git clone if you are cloning web2py from scratch.
+
+    git clone --recursive https://github.com/web2py/web2py.git
+
+If you have an existing repository, the commands below need to be executed at least once:
+
+    git submodule update --init --recursive
+
+If you have a folder gluon/dal you must remove it:
+
+    rm -r gluon/dal
+
+PyDAL uses a separate stable release cycle to the rest of web2py. PyDAL releases will use a date-naming scheme similar to Ubuntu. Issues related to PyDAL should be reported to its separate repository.
+
+
+## Documentation (readthedocs.org)
+
+[![Docs Status](https://readthedocs.org/projects/web2py/badge/?version=latest&style=flat-square)](http://web2py.rtfd.org/)
 
 ## Tests
 
-[![Build Status](https://travis-ci.org/web2py/web2py.png)](https://travis-ci.org/web2py/web2py)
+[![Build Status](https://img.shields.io/travis/web2py/web2py/master.svg?style=flat-square&label=Travis-CI)](https://travis-ci.org/web2py/web2py)
+[![MS Build Status](https://img.shields.io/appveyor/ci/web2py/web2py/master.svg?style=flat-square&label=Appveyor-CI)](https://ci.appveyor.com/project/web2py/web2py)
+[![Coverage Status](https://img.shields.io/codecov/c/github/web2py/web2py.svg?style=flat-square)](https://codecov.io/github/web2py/web2py)
 
-[![Coverage Status](https://coveralls.io/repos/web2py/web2py/badge.png)](https://coveralls.io/r/web2py/web2py)
 
 ## Installation Instructions
 
@@ -29,11 +59,12 @@ That's it!!!
         VERSION                    > this web2py version
         web2py.py                  > the startup script
         anyserver.py               > to run with third party servers
-        wsgihandler.py             > handler to connect to WSGI
         ...                        > other handlers and example files
         gluon/                     > the core libraries
+            packages/              > web2py submodules
+              dal/
             contrib/               > third party libraries
-            tests/                 > unittests	
+            tests/                 > unittests
         applications/              > are the apps
             admin/                 > web based IDE
                 ...
@@ -57,10 +88,13 @@ That's it!!!
         examples/                  > example config files, mv .. and customize
         extras/                    > other files which are required for building web2py
         scripts/                   > utility and installation scripts
+        handlers/
+            wsgihandler.py         > handler to connect to WSGI
+            ...                    > handlers for Fast-CGI, SCGI, Gevent, etc
         site-packages/             > additional optional modules
         logs/                      > log files will go in there
         deposit/                   > a place where web2py stores apps temporarily
 
 ## Issues?
 
-Report issues at http://code.google.com/p/web2py/issues/
+Report issues at https://github.com/web2py/web2py/issues

VERSION

@@ -1 +1 @@
-Version 2.9.5-stable+timestamp.2014.03.15.21.24.06
+Version 2.15.1-stable+timestamp.2017.07.10.16.17.24

anyserver.py

@@ -180,6 +180,11 @@ class Servers:
         s = wsgi.WSGIServer(callable=app, bind="%s:%d" % address)
         s.start()
 
+    @staticmethod
+    def waitress(app, address, **options):
+        from waitress import serve
+        serve(app, host=address[0], port=address[1], _quiet=True)
+
 
 def mongrel2_handler(application, conn, debug=False):
     """

applications/admin/LICENSE

@@ -39,25 +39,6 @@ web2py contains third party software under the gluon/contrib/ folder.
 Each file/module in contrib is distributed with web2py under its original license.
 Here we list some of them.
 
-#### gluon.contrib.simplejson LICENSE
-
-Copyright (c) 2006 Bob Ippolito - 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.
-
 #### gluon.contrib.rss2.py (originally PyRSS2Gen) LICENSE
 
 This is copyright (c) by Dalke Scientific Software, LLC and released under the

applications/admin/controllers/appadmin.py

@@ -10,11 +10,7 @@ import datetime
 import copy
 import gluon.contenttype
 import gluon.fileutils
-
-try:
-    import pygraphviz as pgv
-except ImportError:
-    pgv = None
+from gluon._compat import iteritems
 
 is_gae = request.env.web2py_runtime_gae or False
 
@@ -32,7 +28,7 @@ try:
 except:
     hosts = (http_host, )
 
-if request.env.http_x_forwarded_for or request.is_https:
+if request.is_https:
     session.secure()
 elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1") and \
     (request.function != 'manage'):
@@ -49,7 +45,8 @@ if request.function == 'manage':
                                       auth.table_group(),
                                       auth.table_permission()])
     manager_role = manager_action.get('role', None) if manager_action else None
-    auth.requires_membership(manager_role)(lambda: None)()
+    if not (gluon.fileutils.check_credentials(request) or auth.has_membership(manager_role)):
+        raise HTTP(403, "Not authorized")
     menu = False
 elif (request.application == 'admin' and not session.authorized) or \
         (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
@@ -80,7 +77,6 @@ if False and request.tickets_db:
 def get_databases(request):
     dbs = {}
     for (key, value) in global_env.items():
-        cond = False
         try:
             cond = isinstance(value, GQLDB)
         except:
@@ -89,10 +85,8 @@ def get_databases(request):
             dbs[key] = value
     return dbs
 
-
 databases = get_databases(None)
 
-
 def eval_in_global_env(text):
     exec ('_ret=%s' % text, {}, global_env)
     return global_env['_ret']
@@ -105,7 +99,6 @@ def get_database(request):
         session.flash = T('invalid request')
         redirect(URL('index'))
 
-
 def get_table(request):
     db = get_database(request)
     if len(request.args) > 1 and request.args[1] in db.tables:
@@ -215,7 +208,7 @@ def select():
 
     if is_imap:
         step = 3
- 
+
     stop = start + step
 
     table = None
@@ -270,7 +263,7 @@ def select():
             else:
                 rows = db(query, ignore_common_filters=True).select(
                     *fields, limitby=(start, stop))
-        except Exception, e:
+        except Exception as e:
             import traceback
             tb = traceback.format_exc()
             (rows, nrows) = ([], 0)
@@ -289,7 +282,7 @@ def select():
             import_csv(db[request.vars.table],
                        request.vars.csvfile.file)
             response.flash = T('data uploaded')
-        except Exception, e:
+        except Exception as e:
             response.flash = DIV(T('unable to parse csv file'), PRE(str(e)))
     # end handle upload csv
 
@@ -411,7 +404,7 @@ def ccache():
     import copy
     import time
     import math
-    from gluon import portalocker
+    from pydal.contrib import portalocker
 
     ram = {
         'entries': 0,
@@ -448,57 +441,48 @@ def ccache():
         gae_stats['oldest'] = GetInHMS(time.time() - gae_stats['oldest_item_age'])
         total.update(gae_stats)
     else:
-        for key, value in cache.ram.storage.iteritems():
-            if isinstance(value, dict):
-                ram['hits'] = value['hit_total'] - value['misses']
-                ram['misses'] = value['misses']
+        # get ram stats directly from the cache object
+        ram_stats = cache.ram.stats[request.application]
+        ram['hits'] = ram_stats['hit_total'] - ram_stats['misses']
+        ram['misses'] = ram_stats['misses']
+        try:
+            ram['ratio'] = ram['hits'] * 100 / ram_stats['hit_total']
+        except (KeyError, ZeroDivisionError):
+            ram['ratio'] = 0
+
+        for key, value in iteritems(cache.ram.storage):
+            if hp:
+                ram['bytes'] += hp.iso(value[1]).size
+                ram['objects'] += hp.iso(value[1]).count
+            ram['entries'] += 1
+            if value[0] < ram['oldest']:
+                ram['oldest'] = value[0]
+            ram['keys'].append((key, GetInHMS(time.time() - value[0])))
+
+        for key in cache.disk.storage:
+            value = cache.disk.storage[key]
+            if key == 'web2py_cache_statistics' and isinstance(value[1], dict):
+                disk['hits'] = value[1]['hit_total'] - value[1]['misses']
+                disk['misses'] = value[1]['misses']
                 try:
-                    ram['ratio'] = ram['hits'] * 100 / value['hit_total']
+                    disk['ratio'] = disk['hits'] * 100 / value[1]['hit_total']
                 except (KeyError, ZeroDivisionError):
-                    ram['ratio'] = 0
+                    disk['ratio'] = 0
             else:
                 if hp:
-                    ram['bytes'] += hp.iso(value[1]).size
-                    ram['objects'] += hp.iso(value[1]).count
-                ram['entries'] += 1
-                if value[0] < ram['oldest']:
-                    ram['oldest'] = value[0]
-                ram['keys'].append((key, GetInHMS(time.time() - value[0])))
-        folder = os.path.join(request.folder,'cache')
-        if not os.path.exists(folder):
-            os.mkdir(folder)
-        locker = open(os.path.join(folder, 'cache.lock'), 'a')
-        portalocker.lock(locker, portalocker.LOCK_EX)
-        disk_storage = shelve.open(
-            os.path.join(folder, 'cache.shelve'))
-        try:
-            for key, value in disk_storage.items():
-                if isinstance(value, dict):
-                    disk['hits'] = value['hit_total'] - value['misses']
-                    disk['misses'] = value['misses']
-                    try:
-                        disk['ratio'] = disk['hits'] * 100 / value['hit_total']
-                    except (KeyError, ZeroDivisionError):
-                        disk['ratio'] = 0
-                else:
-                    if hp:
-                        disk['bytes'] += hp.iso(value[1]).size
-                        disk['objects'] += hp.iso(value[1]).count
-                    disk['entries'] += 1
-                    if value[0] < disk['oldest']:
-                        disk['oldest'] = value[0]
-                    disk['keys'].append((key, GetInHMS(time.time() - value[0])))
-        finally:
-            portalocker.unlock(locker)
-            locker.close()
-            disk_storage.close()
+                    disk['bytes'] += hp.iso(value[1]).size
+                    disk['objects'] += hp.iso(value[1]).count
+                disk['entries'] += 1
+                if value[0] < disk['oldest']:
+                    disk['oldest'] = value[0]
+                disk['keys'].append((key, GetInHMS(time.time() - value[0])))
+
+        ram_keys = list(ram) # ['hits', 'objects', 'ratio', 'entries', 'keys', 'oldest', 'bytes', 'misses']
+        ram_keys.remove('ratio')
+        ram_keys.remove('oldest')
+        for key in ram_keys:
+            total[key] = ram[key] + disk[key]
 
-        total['entries'] = ram['entries'] + disk['entries']
-        total['bytes'] = ram['bytes'] + disk['bytes']
-        total['objects'] = ram['objects'] + disk['objects']
-        total['hits'] = ram['hits'] + disk['hits']
-        total['misses'] = ram['misses'] + disk['misses']
-        total['keys'] = ram['keys'] + disk['keys']
         try:
             total['ratio'] = total['hits'] * 100 / (total['hits'] +
                                                 total['misses'])
@@ -576,59 +560,6 @@ def table_template(table):
                                           _cellborder=0, _cellspacing=0)
                              ).xml()
 
-
-def bg_graph_model():
-    graph = pgv.AGraph(layout='dot',  directed=True,  strict=False,  rankdir='LR')
-
-    subgraphs = dict()
-    for tablename in db.tables:
-        if hasattr(db[tablename],'_meta_graphmodel'):
-            meta_graphmodel = db[tablename]._meta_graphmodel
-        else:
-            meta_graphmodel = dict(group='Undefined', color='#ECECEC')
-
-        group = meta_graphmodel['group'].replace(' ', '')
-        if not subgraphs.has_key(group):
-            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
-            subgraphs[group]['tables'].append(tablename)
-        else:
-            subgraphs[group]['tables'].append(tablename)
-
-        graph.add_node(tablename, name=tablename, shape='plaintext',
-                       label=table_template(tablename))
-
-    for n, key in enumerate(subgraphs.iterkeys()):
-        graph.subgraph(nbunch=subgraphs[key]['tables'],
-                    name='cluster%d' % n,
-                    style='filled',
-                    color=subgraphs[key]['meta']['color'],
-                    label=subgraphs[key]['meta']['group'])
-
-    for tablename in db.tables:
-        for field in db[tablename]:
-            f_type = field.type
-            if isinstance(f_type,str) and (
-                f_type.startswith('reference') or
-                f_type.startswith('list:reference')):
-                referenced_table = f_type.split()[1].split('.')[0]
-                n1 = graph.get_node(tablename)
-                n2 = graph.get_node(referenced_table)
-                graph.add_edge(n1, n2, color="#4C4C4C", label='')
-
-    graph.layout()
-    if not request.args:
-        response.headers['Content-Type'] = 'image/png'
-        return graph.draw(format='png', prog='dot')
-    else:
-        response.headers['Content-Disposition']='attachment;filename=graph.%s'%request.args(0)
-        if request.args(0) == 'dot':
-            return graph.string()
-        else:
-            return graph.draw(format=request.args(0), prog='dot')
-
-def graph_model():
-    return dict(databases=databases, pgv=pgv)
-
 def manage():
     tables = manager_action['tables']
     if isinstance(tables[0], str):
@@ -670,3 +601,95 @@ def manage():
     kwargs.update(**smartgrid_args.get(table._tablename, {}))
     grid = SQLFORM.smartgrid(table, args=request.args[:2], formname=formname, **kwargs)
     return grid
+
+def hooks():
+    import functools
+    import inspect
+    list_op=['_%s_%s' %(h,m) for h in ['before', 'after'] for m in ['insert','update','delete']]
+    tables=[]
+    with_build_it=False
+    for db_str in sorted(databases):
+        db = databases[db_str]
+        for t in db.tables:
+            method_hooks=[]
+            for op in list_op:
+                functions = []
+                for f in getattr(db[t], op):
+                    if hasattr(f, '__call__'):
+                        try:
+                            if isinstance(f, (functools.partial)):
+                                f = f.func
+                            filename = inspect.getsourcefile(f)
+                            details = {'funcname':f.__name__,
+                                       'filename':filename[len(request.folder):] if request.folder in filename else None,
+                                       'lineno': inspect.getsourcelines(f)[1]}
+                            if details['filename']: # Built in functions as delete_uploaded_files are not editable
+                                details['url'] = URL(a='admin',c='default',f='edit', args=[request['application'], details['filename']],vars={'lineno':details['lineno']})
+                            if details['filename'] or with_build_it:
+                                functions.append(details)
+                        # compiled app and windows build don't support code inspection
+                        except:
+                            pass
+                if len(functions):
+                    method_hooks.append({'name':op, 'functions':functions})
+            if len(method_hooks):
+                tables.append({'name':"%s.%s" % (db_str,t), 'slug': IS_SLUG()("%s.%s" % (db_str,t))[0], 'method_hooks':method_hooks})
+    # Render
+    ul_main = UL(_class='nav nav-list')
+    for t in tables:
+        ul_main.append(A(t['name'], _onclick="collapse('a_%s')" % t['slug']))
+        ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
+        for op in t['method_hooks']:
+            ul_t.append(LI (op['name']))
+            ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
+        ul_main.append(ul_t)
+    return ul_main
+
+
+# ##########################################################
+# d3 based model visualizations
+# ###########################################################
+
+def d3_graph_model():
+    """ See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
+    and also the app_admin bg_graph_model function
+    
+    Create a list of table dicts, called "nodes"
+    """
+    
+    data = {}
+    nodes = []
+    links = []
+
+    subgraphs = dict()
+
+    for tablename in db.tables:
+        fields = []
+        for field in db[tablename]:
+            f_type = field.type
+            if not isinstance(f_type,str):
+                disp = ' '
+            elif f_type == 'string':
+                disp =  field.length
+            elif f_type == 'id':
+                disp =  "PK"
+            elif f_type.startswith('reference') or \
+                f_type.startswith('list:reference'):
+                disp = "FK"
+            else:
+                disp = ' '
+            fields.append(dict(name= field.name, type=field.type, disp = disp))
+
+            if isinstance(f_type,str) and (
+                f_type.startswith('reference') or
+                f_type.startswith('list:reference')):
+                referenced_table = f_type.split()[1].split('.')[0]
+
+                links.append(dict(source=tablename, target = referenced_table))
+
+        nodes.append(dict(name=tablename, type="table", fields = fields))
+
+    # d3 v4 allows individual modules to be specified.  The complete d3 library is included below.
+    response.files.append(URL('admin','static','js/d3.min.js'))
+    response.files.append(URL('admin','static','js/d3_graph.js'))
+    return dict(databases=databases, nodes=nodes, links=links)

applications/admin/controllers/debug.py

@@ -1,13 +1,12 @@
 import os
 import sys
-import cStringIO
-import gluon.contrib.shell
 import gluon.dal
 import gluon.html
 import gluon.validators
 import code
-import thread
-from gluon.debug import communicate, web_debugger, qdb_debugger
+from gluon.debug import communicate, web_debugger, dbg_debugger
+from gluon._compat import thread
+from gluon.fileutils import open_file
 import pydoc
 
 
@@ -41,7 +40,7 @@ def reset():
     return 'done'
 
 
-# new implementation using qdb
+# new implementation using dbg
 
 def interact():
     app = request.args(0) or 'admin'
@@ -56,7 +55,7 @@ def interact():
     if filename:
         # prevent IOError 2 on some circuntances (EAFP instead of os.access)
         try:
-            lines = open(filename).readlines()
+            lines = open_file(filename, 'r').readlines()
         except:
             lines = ""
         lines = dict([(i + 1, l) for (i, l) in enumerate(
@@ -72,8 +71,7 @@ def interact():
         f_globals = {}
         for name, value in env['globals'].items():
             if name not in gluon.html.__all__ and \
-                name not in gluon.validators.__all__ and \
-                    name not in gluon.dal.__all__:
+                name not in gluon.validators.__all__:
                 f_globals[name] = pydoc.text.repr(value)
     else:
         f_locals = {}
@@ -123,7 +121,7 @@ def execute():
         output = web_debugger.do_exec(command)
         if output is None:
             output = ""
-    except Exception, e:
+    except Exception as e:
         output = T("Exception %s") % str(e)
     k = len(session['debug_commands:' + app]) - 1
     return '[%i] %s%s\n' % (k + 1, command, output)
@@ -152,7 +150,7 @@ def breakpoints():
     if form.accepts(request.vars, session):
         filename = os.path.join(request.env['applications_parent'],
                                 'applications', form.vars.filename)
-        err = qdb_debugger.do_set_breakpoint(filename,
+        err = dbg_debugger.do_set_breakpoint(filename,
                                              form.vars.lineno,
                                              form.vars.temporary,
                                              form.vars.condition)
@@ -161,13 +159,13 @@ def breakpoints():
 
     for item in request.vars:
         if item[:7] == 'delete_':
-            qdb_debugger.do_clear(item[7:])
+            dbg_debugger.do_clear(item[7:])
 
     breakpoints = [{'number': bp[0], 'filename': os.path.basename(bp[1]),
                     'path': bp[1], 'lineno': bp[2],
                     'temporary': bp[3], 'enabled': bp[4], 'hits': bp[5],
                     'condition': bp[6]}
-                   for bp in qdb_debugger.do_list_breakpoint()]
+                   for bp in dbg_debugger.do_list_breakpoint()]
 
     return dict(breakpoints=breakpoints, form=form)
 
@@ -196,24 +194,24 @@ def toggle_breakpoint():
             else:
                 lineno = None
         if lineno is not None:
-            for bp in qdb_debugger.do_list_breakpoint():
+            for bp in dbg_debugger.do_list_breakpoint():
                 no, bp_filename, bp_lineno, temporary, enabled, hits, cond = bp
                 # normalize path name: replace slashes, references, etc...
                 bp_filename = os.path.normpath(os.path.normcase(bp_filename))
                 if filename == bp_filename and lineno == bp_lineno:
-                    err = qdb_debugger.do_clear_breakpoint(filename, lineno)
+                    err = dbg_debugger.do_clear_breakpoint(filename, lineno)
                     response.flash = T("Removed Breakpoint on %s at line %s", (
                         filename, lineno))
                     ok = False
                     break
             else:
-                err = qdb_debugger.do_set_breakpoint(filename, lineno)
+                err = dbg_debugger.do_set_breakpoint(filename, lineno)
                 response.flash = T("Set Breakpoint on %s at line %s: %s") % (
                     filename, lineno, err or T('successful'))
                 ok = True
         else:
             response.flash = T("Unable to determine the line number!")
-    except Exception, e:
+    except Exception as e:
         session.flash = str(e)
     return response.json({'ok': ok, 'lineno': lineno})
 
@@ -221,20 +219,19 @@ def list_breakpoints():
     "Return a list of linenumbers for current breakpoints"
 
     breakpoints = []
-    ok = None
+    ok = False
     try:
         filename = os.path.join(request.env['applications_parent'],
                                 'applications', request.vars.filename)
         # normalize path name: replace slashes, references, etc...
         filename = os.path.normpath(os.path.normcase(filename))
-        for bp in qdb_debugger.do_list_breakpoint():
+        for bp in dbg_debugger.do_list_breakpoint():
             no, bp_filename, bp_lineno, temporary, enabled, hits, cond = bp
             # normalize path name: replace slashes, references, etc...
             bp_filename = os.path.normpath(os.path.normcase(bp_filename))
             if filename == bp_filename:
                 breakpoints.append(bp_lineno)
         ok = True
-    except Exception, e:
+    except Exception as e:
         session.flash = str(e)
-        ok = False
     return response.json({'ok': ok, 'breakpoints': breakpoints})

applications/admin/controllers/default.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 
 EXPERIMENTAL_STUFF = True
 MAXNFILES = 1000
@@ -15,6 +15,8 @@ from gluon.utils import web2py_uuid
 from gluon.tools import Config
 from gluon.compileapp import find_exposed_functions
 from glob import glob
+from gluon._compat import iteritems, PY2, pickle, xrange, urlopen, to_bytes, StringIO, to_native
+import gluon.rewrite
 import shutil
 import platform
 
@@ -23,7 +25,7 @@ try:
     if git.__version__ < '0.3.1':
         raise ImportError("Your version of git is %s. Upgrade to 0.3.1 or better." % git.__version__)
     have_git = True
-except ImportError, e:
+except ImportError as e:
     have_git = False
     GIT_MISSING = 'Requires gitpython module, but not installed or incompatible version: %s' % e
 
@@ -32,15 +34,15 @@ from gluon.languages import (read_possible_languages, read_dict, write_dict,
 
 
 if DEMO_MODE and request.function in ['change_password', 'pack',
-'pack_custom','pack_plugin', 'upgrade_web2py', 'uninstall',
-'cleanup', 'compile_app', 'remove_compiled_app', 'delete',
-'delete_plugin', 'create_file', 'upload_file', 'update_languages',
-'reload_routes', 'git_push', 'git_pull', 'install_plugin']:
+                                      'pack_custom', 'pack_plugin', 'upgrade_web2py', 'uninstall',
+                                      'cleanup', 'compile_app', 'remove_compiled_app', 'delete',
+                                      'delete_plugin', 'create_file', 'upload_file', 'update_languages',
+                                      'reload_routes', 'git_push', 'git_pull', 'install_plugin']:
     session.flash = T('disabled in demo mode')
     redirect(URL('site'))
 
 if is_gae and request.function in ('edit', 'edit_language',
-'edit_plurals', 'update_languages', 'create_file', 'install_plugin'):
+                                   'edit_plurals', 'update_languages', 'create_file', 'install_plugin'):
     session.flash = T('disabled in GAE mode')
     redirect(URL('site'))
 
@@ -74,12 +76,17 @@ def log_progress(app, mode='EDIT', filename=None, progress=0):
 def safe_open(a, b):
     if (DEMO_MODE or is_gae) and ('w' in b or 'a' in b):
         class tmp:
+
             def write(self, data):
                 pass
+
             def close(self):
                 pass
         return tmp()
-    return open(a, b)
+    if PY2 or 'b' in b:
+        return open(a, b)
+    else:
+        return open(a, b, encoding="utf8")
 
 
 def safe_read(a, b='r'):
@@ -119,6 +126,9 @@ def index():
         send = URL('site')
     if session.authorized:
         redirect(send)
+    elif failed_login_count() >= allowed_number_of_attempts:
+        time.sleep(2 ** allowed_number_of_attempts)
+        raise HTTP(403)
     elif request.vars.password:
         if verify_password(request.vars.password[:1024]):
             session.authorized = True
@@ -208,6 +218,7 @@ def site():
     file_or_appurl = 'file' in request.vars or 'appurl' in request.vars
 
     class IS_VALID_APPNAME(object):
+
         def __call__(self, value):
             if not re.compile('^\w+$').match(value):
                 return (value, T('Invalid application name'))
@@ -239,6 +250,7 @@ def site():
                 db.app.insert(name=appname, owner=auth.user.id)
             log_progress(appname)
             session.flash = T('new application "%s" created', appname)
+            gluon.rewrite.load()
             redirect(URL('design', args=appname))
         else:
             session.flash = \
@@ -256,19 +268,20 @@ def site():
                 new_repo = git.Repo.clone_from(form_update.vars.url, target)
                 session.flash = T('new application "%s" imported',
                                   form_update.vars.name)
-            except git.GitCommandError, err:
+                gluon.rewrite.load()
+            except git.GitCommandError as err:
                 session.flash = T('Invalid git repository specified.')
             redirect(URL(r=request))
 
         elif form_update.vars.url:
             # fetch an application via URL or file upload
             try:
-                f = urllib.urlopen(form_update.vars.url)
+                f = urlopen(form_update.vars.url)
                 if f.code == 404:
                     raise Exception("404 file not found")
-            except Exception, e:
+            except Exception as e:
                 session.flash = \
-                    DIV(T('Unable to download app because:'), PRE(str(e)))
+                    DIV(T('Unable to download app because:'), PRE(repr(e)))
                 redirect(URL(r=request))
             fname = form_update.vars.url
 
@@ -292,9 +305,7 @@ def site():
             log_progress(appname)
             session.flash = T(msg, dict(appname=appname,
                                         digest=md5_hash(installed)))
-        elif f and form_update.vars.overwrite:
-            msg = 'unable to install application "%(appname)s"'
-            session.flash = T(msg, dict(appname=form_update.vars.name))
+            gluon.rewrite.load()
         else:
             msg = 'unable to install application "%(appname)s"'
             session.flash = T(msg, dict(appname=form_update.vars.name))
@@ -303,14 +314,15 @@ def site():
     regex = re.compile('^\w+$')
 
     if is_manager():
-        apps = [f for f in os.listdir(apath(r=request)) if regex.match(f)]
+        apps = [a for a in os.listdir(apath(r=request)) if regex.match(a) and
+                a != '__pycache__']
     else:
-        apps = [f.name for f in db(db.app.owner == auth.user_id).select()]
+        apps = [a.name for a in db(db.app.owner == auth.user_id).select()]
 
     if FILTER_APPS:
-        apps = [f for f in apps if f in FILTER_APPS]
+        apps = [a for a in apps if a in FILTER_APPS]
 
-    apps = sorted(apps, lambda a, b: cmp(a.upper(), b.upper()))
+    apps = sorted(apps, key=lambda a: a.upper())
     myplatform = platform.python_version()
     return dict(app=None, apps=apps, myversion=myversion, myplatform=myplatform,
                 form_create=form_create, form_update=form_update)
@@ -328,7 +340,7 @@ def report_progress(app):
         if not m:
             continue
         days = -(request.now - datetime.datetime.strptime(m[0],
-                 '%Y-%m-%d %H:%M:%S')).days
+                                                          '%Y-%m-%d %H:%M:%S')).days
         counter += int(m[1])
         events.append([days, counter])
     return events
@@ -344,7 +356,7 @@ def pack():
         else:
             fname = 'web2py.app.%s.compiled.w2p' % app
             filename = app_pack_compiled(app, request, raise_ex=True)
-    except Exception, e:
+    except Exception as e:
         filename = None
 
     if filename:
@@ -356,6 +368,7 @@ def pack():
         session.flash = T('internal error: %s', e)
         redirect(URL('site'))
 
+
 def pack_plugin():
     app = get_app()
     if len(request.args) == 2:
@@ -370,31 +383,65 @@ def pack_plugin():
         session.flash = T('internal error')
         redirect(URL('plugin', args=request.args))
 
+
+def pack_exe(app, base, filenames=None):
+    import urllib
+    import zipfile
+    # Download latest web2py_win and open it with zipfile
+    download_url = 'http://www.web2py.com/examples/static/web2py_win.zip'
+    out = StringIO()
+    out.write(urlopen(download_url).read())
+    web2py_win = zipfile.ZipFile(out, mode='a')
+    # Write routes.py with the application as default
+    routes = u'# -*- coding: utf-8 -*-\nrouters = dict(BASE=dict(default_application="%s"))' % app
+    web2py_win.writestr('web2py/routes.py', routes.encode('utf-8'))
+    # Copy the application into the zipfile
+    common_root = os.path.dirname(base)
+    for filename in filenames:
+        fname = os.path.join(base, filename)
+        arcname = os.path.join('web2py/applications', app, filename)
+        web2py_win.write(fname, arcname)
+    web2py_win.close()
+    response.headers['Content-Type'] = 'application/zip'
+    response.headers['Content-Disposition'] = 'attachment; filename=web2py.app.%s.zip' % app
+    out.seek(0)
+    return response.stream(out)
+
+
 def pack_custom():
     app = get_app()
     base = apath(app, r=request)
-    if request.post_vars.file:
-        files = request.post_vars.file
-        files = [files] if not isinstance(files,list) else files
-        fname = 'web2py.app.%s.w2p' % app
-        try:
-            filename = app_pack(app, request, raise_ex=True, filenames=files)
-        except Exception, e:
-            filename = None
-        if filename:
-            response.headers['Content-Type'] = 'application/w2p'
-            disposition = 'attachment; filename=%s' % fname
-            response.headers['Content-Disposition'] = disposition
-            return safe_read(filename, 'rb')
-        else:
-            session.flash = T('internal error: %s', e)
-            redirect(URL(args=request.args))
+
     def ignore(fs):
         return [f for f in fs if not (
                 f[:1] in '#' or f.endswith('~') or f.endswith('.bak'))]
     files = {}
-    for (r,d,f) in os.walk(base):
-        files[r] = {'folders':ignore(d),'files':ignore(f)}
+    for (r, d, f) in os.walk(base):
+        files[r] = {'folders': ignore(d), 'files': ignore(f)}
+
+    if request.post_vars.file:
+        valid_set = set(os.path.relpath(os.path.join(r, f), base) for r in files for f in files[r]['files'])
+        files = request.post_vars.file
+        files = [files] if not isinstance(files, list) else files
+        files = [file for file in files if file in valid_set]
+
+        if request.post_vars.doexe is None:
+            fname = 'web2py.app.%s.w2p' % app
+            try:
+                filename = app_pack(app, request, raise_ex=True, filenames=files)
+            except Exception as e:
+                filename = None
+            if filename:
+                response.headers['Content-Type'] = 'application/w2p'
+                disposition = 'attachment; filename=%s' % fname
+                response.headers['Content-Disposition'] = disposition
+                return safe_read(filename, 'rb')
+            else:
+                session.flash = T('internal error: %s', e)
+                redirect(URL(args=request.args))
+        else:
+            return pack_exe(app, base, files)
+
     return locals()
 
 
@@ -456,9 +503,15 @@ def cleanup():
 
 def compile_app():
     app = get_app()
-    c = app_compile(app, request)
+    c = app_compile(app, request,
+                    skip_failed_views=(request.args(1) == 'skip_failed_views'))
     if not c:
         session.flash = T('application compiled')
+    elif isinstance(c, list):
+        session.flash = DIV(*[T('application compiled'), BR(), BR(),
+                              T('WARNING: The following views could not be compiled:'), BR()] +
+                            [CAT(BR(), view) for view in c] +
+                            [BR(), BR(), T('DO NOT use the "Pack compiled" feature.')])
     else:
         session.flash = DIV(T('Cannot compile: there are errors in your app:'),
                             CODE(c))
@@ -499,8 +552,8 @@ def delete():
         redirect(URL(sender, anchor=request.vars.id2))
     return dict(dialog=dialog, filename=filename)
 
-
 def enable():
+    if not URL.verify(request, hmac_key=session.hmac_key): raise HTTP(401)
     app = get_app()
     filename = os.path.join(apath(app, r=request), 'DISABLED')
     if is_gae:
@@ -512,6 +565,7 @@ def enable():
         safe_open(filename, 'wb').write('disabled: True\ntime-disabled: %s' % request.now)
         return SPAN(T('Enable'), _style='color:red')
 
+
 def peek():
     """ Visualize object code """
     app = get_app(request.vars.app)
@@ -575,7 +629,7 @@ def edit():
     # Load json only if it is ajax edited...
     app = get_app(request.vars.app)
     app_path = apath(app, r=request)
-    preferences={'theme':'web2py', 'editor': 'default', 'closetag': 'true', 'codefolding': 'false', 'tabwidth':'4', 'indentwithtabs':'false', 'linenumbers':'true', 'highlightline':'true'}
+    preferences = {'theme': 'web2py', 'editor': 'default', 'closetag': 'true', 'codefolding': 'false', 'tabwidth': '4', 'indentwithtabs': 'false', 'linenumbers': 'true', 'highlightline': 'true'}
     config = Config(os.path.join(request.folder, 'settings.cfg'),
                     section='editor', default_values={})
     preferences.update(config.read())
@@ -583,14 +637,14 @@ def edit():
     if not(request.ajax) and not(is_mobile):
         # return the scaffolding, the rest will be through ajax requests
         response.title = T('Editing %s') % app
-        return response.render ('default/edit.html', dict(app=app, editor_settings=preferences))
+        return response.render('default/edit.html', dict(app=app, editor_settings=preferences))
 
     # show settings tab and save prefernces
     if 'settings' in request.vars:
-        if request.post_vars:        #save new preferences
+        if request.post_vars:  # save new preferences
             post_vars = request.post_vars.items()
-            # Since unchecked checkbox are not serialized, we must set them as false by hand to store the correct preference in the settings 
-            post_vars+= [(opt, 'false') for opt in preferences if opt not in request.post_vars ]
+            # Since unchecked checkbox are not serialized, we must set them as false by hand to store the correct preference in the settings
+            post_vars += [(opt, 'false') for opt in preferences if opt not in request.post_vars]
             if config.save(post_vars):
                 response.headers["web2py-component-flash"] = T('Preferences saved correctly')
             else:
@@ -598,8 +652,8 @@ def edit():
             response.headers["web2py-component-command"] = "update_editor(%s);$('a[href=#editor_settings] button.close').click();" % response.json(config.read())
             return
         else:
-            details = {'realfilename':'settings', 'filename':'settings', 'id':'editor_settings', 'force': False}
-            details['plain_html'] = response.render('default/editor_settings.html', {'editor_settings':preferences})
+            details = {'realfilename': 'settings', 'filename': 'settings', 'id': 'editor_settings', 'force': False}
+            details['plain_html'] = response.render('default/editor_settings.html', {'editor_settings': preferences})
             return response.json(details)
 
     """ File edit handler """
@@ -686,7 +740,7 @@ def edit():
         try:
             code = request.vars.data.rstrip().replace('\r\n', '\n') + '\n'
             compile(code, path, "exec", _ast.PyCF_ONLY_AST)
-        except Exception, e:
+        except Exception as e:
             # offset calculation is only used for textarea (start/stop)
             start = sum([len(line) + 1 for l, line
                          in enumerate(request.vars.data.split("\n"))
@@ -706,18 +760,18 @@ def edit():
                                  B(ex_name), ' ' + T('at line %s', e.lineno),
                                  offset and ' ' +
                                  T('at char %s', offset) or '',
-                                 PRE(str(e)))
+                                 PRE(repr(e)))
     if data_or_revert and request.args[1] == 'modules':
         # Lets try to reload the modules
         try:
             mopath = '.'.join(request.args[2:])[:-3]
-            exec 'import applications.%s.modules.%s' % (
-                request.args[0], mopath)
+            exec('import applications.%s.modules.%s' % (
+                request.args[0], mopath))
             reload(sys.modules['applications.%s.modules.%s'
                                % (request.args[0], mopath)])
-        except Exception, e:
+        except Exception as e:
             response.flash = DIV(
-                T('failed to reload module because:'), PRE(str(e)))
+                T('failed to reload module because:'), PRE(repr(e)))
 
     edit_controller = None
     editviewlinks = None
@@ -730,8 +784,8 @@ def edit():
             view = request.args[3].replace('.html', '')
             view_link = URL(request.args[0], request.args[2], view)
     elif filetype == 'python' and request.args[1] == 'controllers':
-        ## it's a controller file.
-        ## Create links to all of the associated view files.
+        # it's a controller file.
+        # Create links to all of the associated view files.
         app = get_app()
         viewname = os.path.splitext(request.args[2])[0]
         viewpath = os.path.join(app, 'views', viewname)
@@ -744,7 +798,7 @@ def edit():
             viewlist.append(aviewpath + '.html')
         if len(viewlist):
             editviewlinks = []
-            for v in viewlist:
+            for v in sorted(viewlist):
                 vf = os.path.split(v)[-1]
                 vargs = "/".join([viewpath.replace(os.sep, "/"), vf])
                 editviewlinks.append(A(vf.split(".")[0],
@@ -754,6 +808,7 @@ def edit():
     if len(request.args) > 2 and request.args[1] == 'controllers':
         controller = (request.args[2])[:-3]
         functions = find_exposed_functions(data)
+        functions = functions and sorted(functions) or []
     else:
         (controller, functions) = (None, None)
 
@@ -761,38 +816,40 @@ def edit():
         return response.json({'file_hash': file_hash, 'saved_on': saved_on, 'functions': functions, 'controller': controller, 'application': request.args[0], 'highlight': highlight})
     else:
         file_details = dict(app=request.args[0],
-                    lineno=request.vars.lineno or 1,
-                    editor_settings=preferences,
-                    filename=filename,
-                    realfilename=realfilename,
-                    filetype=filetype,
-                    data=data,
-                    edit_controller=edit_controller,
-                    file_hash=file_hash,
-                    saved_on=saved_on,
-                    controller=controller,
-                    functions=functions,
-                    view_link=view_link,
-                    editviewlinks=editviewlinks,
-                    id=IS_SLUG()(filename)[0],
-                    force= True if (request.vars.restore or 
-                                    request.vars.revert) else False)
+                            lineno=request.vars.lineno or 1,
+                            editor_settings=preferences,
+                            filename=filename,
+                            realfilename=realfilename,
+                            filetype=filetype,
+                            data=data,
+                            edit_controller=edit_controller,
+                            file_hash=file_hash,
+                            saved_on=saved_on,
+                            controller=controller,
+                            functions=functions,
+                            view_link=view_link,
+                            editviewlinks=editviewlinks,
+                            id=IS_SLUG()(filename)[0],
+                            force=True if (request.vars.restore or
+                                           request.vars.revert) else False)
         plain_html = response.render('default/edit_js.html', file_details)
         file_details['plain_html'] = plain_html
         if is_mobile:
-            return response.render('default.mobile/edit.html', 
+            return response.render('default.mobile/edit.html',
                                    file_details, editor_settings=preferences)
         else:
             return response.json(file_details)
 
+
 def todolist():
     """ Returns all TODO of the requested app
     """
     app = request.vars.app or ''
-    app_path = apath('%(app)s' % {'app':app}, r=request)
-    dirs=['models', 'controllers', 'modules', 'private' ]
+    app_path = apath('%(app)s' % {'app': app}, r=request)
+    dirs = ['models', 'controllers', 'modules', 'private']
+
     def listfiles(app, dir, regexp='.*\.py$'):
-        files = sorted( listdir(apath('%(app)s/%(dir)s/' % {'app':app, 'dir':dir}, r=request), regexp))
+        files = sorted(listdir(apath('%(app)s/%(dir)s/' % {'app': app, 'dir': dir}, r=request), regexp))
         files = [x.replace(os.path.sep, '/') for x in files if not x.endswith('.bak')]
         return files
 
@@ -803,17 +860,18 @@ def todolist():
     for d in dirs:
         for f in listfiles(app, d):
             matches = []
-            filename= apath(os.path.join(app, d, f), r=request)
-            with open(filename, 'r') as f_s:
+            filename = apath(os.path.join(app, d, f), r=request)
+            with safe_open(filename, 'r') as f_s:
                 src = f_s.read()
                 for m in regex.finditer(src):
                     start = m.start()
                     lineno = src.count('\n', 0, start) + 1
-                    matches.append({'text':m.group(0), 'lineno':lineno})
+                    matches.append({'text': m.group(0), 'lineno': lineno})
             if len(matches) != 0:
-                output.append({'filename':f,'matches':matches, 'dir':d})
+                output.append({'filename': f, 'matches': matches, 'dir': d})
+
+    return {'todo': output, 'app': app}
 
-    return {'todo':output, 'app': app}
 
 def editor_sessions():
     config = Config(os.path.join(request.folder, 'settings.cfg'),
@@ -823,13 +881,14 @@ def editor_sessions():
     if request.vars.session_name and request.vars.files:
         session_name = request.vars.session_name
         files = request.vars.files
-        preferences.update({session_name:','.join(files)})
+        preferences.update({session_name: ','.join(files)})
         if config.save(preferences.items()):
             response.headers["web2py-component-flash"] = T('Session saved correctly')
         else:
             response.headers["web2py-component-flash"] = T('Session saved on session only')
 
-    return response.render('default/editor_sessions.html', {'editor_sessions':preferences})
+    return response.render('default/editor_sessions.html', {'editor_sessions': preferences})
+
 
 def resolve():
     """
@@ -866,13 +925,9 @@ def resolve():
 
     def getclass(item):
         """ Determine item class """
+        operators = {' ': 'normal', '+': 'plus', '-': 'minus'}
 
-        if item[0] == ' ':
-            return 'normal'
-        if item[0] == '+':
-            return 'plus'
-        if item[0] == '-':
-            return 'minus'
+        return operators[item[0]]
 
     if request.vars:
         c = '\n'.join([item[2:].rstrip() for (i, item) in enumerate(d) if item[0]
@@ -890,7 +945,7 @@ def resolve():
         diff = TABLE(*[TR(TD(gen_data(i, item)),
                           TD(item[0]),
                           TD(leading(item[2:]),
-                          TT(item[2:].rstrip())),
+                             TT(item[2:].rstrip())),
                           _class=getclass(item))
                        for (i, item) in enumerate(d) if item[0] != '?'])
 
@@ -937,11 +992,11 @@ def edit_language():
 
         new_row = DIV(LABEL(prefix, k, _style="font-weight:normal;"),
                       CAT(elem, '\n', TAG.BUTTON(
-                    T('delete'),
-                    _onclick='return delkey("%s")' % name,
-                    _class='btn')), _id=name, _class='span6 well well-small')
+                          T('delete'),
+                          _onclick='return delkey("%s")' % name,
+                          _class='btn')), _id=name, _class='span6 well well-small')
 
-        rows.append(DIV(new_row,_class="row-fluid"))
+        rows.append(DIV(new_row, _class="row-fluid"))
     rows.append(DIV(INPUT(_type='submit', _value=T('update'), _class="btn btn-primary"), _class='controls'))
     form = FORM(*rows)
     if form.accepts(request.vars, keepvalues=True):
@@ -1037,11 +1092,11 @@ def design():
             redirect(URL('design', args=app))
         else:
             session.flash = \
-                T('unable to create application "%s"', request.vars.filename)
-        redirect(URL(r=request))
+                T('unable to install plugin "%s"', filename)
+        redirect(URL(r=request, args=app))
     elif isinstance(request.vars.pluginfile, str):
         session.flash = T('plugin not specified')
-        redirect(URL(r=request))
+        redirect(URL(r=request, args=app))
 
     # If we have only pyc files it means that
     # we cannot design
@@ -1067,7 +1122,7 @@ def design():
     for c in controllers:
         data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
         items = find_exposed_functions(data)
-        functions[c] = items
+        functions[c] = items and sorted(items) or []
 
     # Get all views
     views = sorted(
@@ -1097,18 +1152,18 @@ def design():
 
     # Get all static files
     statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*',
-                      maxnum = MAXNFILES)
+                      maxnum=MAXNFILES)
     statics = [x.replace(os.path.sep, '/') for x in statics]
     statics.sort()
 
     # Get all languages
-    langpath = os.path.join(apath(app, r=request),'languages')
+    langpath = os.path.join(apath(app, r=request), 'languages')
     languages = dict([(lang, info) for lang, info
-                      in read_possible_languages(langpath).iteritems()
+                      in iteritems(read_possible_languages(langpath))
                       if info[2] != 0])  # info[2] is langfile_mtime:
-                                         # get only existed files
+    # get only existed files
 
-    #Get crontab
+    # Get crontab
     cronfolder = apath('%s/cron' % app, r=request)
     crontab = apath('%s/cron/crontab' % app, r=request)
     if not is_gae:
@@ -1205,7 +1260,7 @@ def plugin():
     for c in controllers:
         data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
         items = find_exposed_functions(data)
-        functions[c] = items
+        functions[c] = items and sorted(items) or []
 
     # Get all views
     views = sorted(
@@ -1234,17 +1289,17 @@ def plugin():
 
     # Get all static files
     statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*',
-                      maxnum = MAXNFILES)
+                      maxnum=MAXNFILES)
     statics = [x.replace(os.path.sep, '/') for x in statics]
     statics.sort()
 
     # Get all languages
     languages = sorted([lang + '.py' for lang, info in
-                        T.get_possible_languages_info().iteritems()
+                        iteritems(T.get_possible_languages_info())
                         if info[2] != 0])  # info[2] is langfile_mtime:
-                                    # get only existed files
+    # get only existed files
 
-    #Get crontab
+    # Get crontab
     crontab = apath('%s/cron/crontab' % app, r=request)
     if not os.path.exists(crontab):
         safe_write(crontab, '#crontab')
@@ -1267,6 +1322,7 @@ def plugin():
                 languages=languages,
                 crontab=crontab)
 
+
 def create_file():
     """ Create files handler """
     if request.vars and not request.vars.token == session.token:
@@ -1278,7 +1334,7 @@ def create_file():
             path = abspath(request.vars.location)
         else:
             if request.vars.dir:
-            	request.vars.location += request.vars.dir + '/'
+                request.vars.location += request.vars.dir + '/'
             app = get_app(name=request.vars.location.split('/')[0])
             path = apath(request.vars.location, r=request)
         filename = re.sub('[^\w./-]+', '_', request.vars.filename)
@@ -1292,7 +1348,7 @@ def create_file():
             langinfo = read_possible_languages(apath(app, r=request))[lang]
             text = dedent("""
                    #!/usr/bin/env python
-                   # -*- coding: utf8 -*-
+                   # -*- coding: utf-8 -*-
                    # Plural-Forms for %(lang)s (%(langname)s)
 
                    nplurals=2  # for example, English language has 2 forms:
@@ -1333,7 +1389,7 @@ def create_file():
             if len(filename) == 3:
                 raise SyntaxError
 
-            text = '# coding: utf8\n'
+            text = '# -*- coding: utf-8 -*-\n'
 
         elif path[-13:] == '/controllers/':
             # Handle python controllers
@@ -1343,7 +1399,7 @@ def create_file():
             if len(filename) == 3:
                 raise SyntaxError
 
-            text = '# coding: utf8\n# %s\ndef index(): return dict(message="hello from %s")'
+            text = '# -*- coding: utf-8 -*-\n# %s\ndef index(): return dict(message="hello from %s")'
             text = text % (T('try something like'), filename)
 
         elif path[-7:] == '/views/':
@@ -1383,12 +1439,12 @@ def create_file():
 
             text = dedent("""
                    #!/usr/bin/env python
-                   # coding: utf8
+                   # -*- coding: utf-8 -*-
                    from gluon import *\n""")[1:]
 
         elif (path[-8:] == '/static/') or (path[-9:] == '/private/'):
-            if (request.vars.plugin and 
-                not filename.startswith('plugin_%s/' % request.vars.plugin)):
+            if (request.vars.plugin and
+                    not filename.startswith('plugin_%s/' % request.vars.plugin)):
                 filename = 'plugin_%s/%s' % (request.vars.plugin, filename)
             text = ''
 
@@ -1408,62 +1464,65 @@ def create_file():
         log_progress(app, 'CREATE', filename)
         if request.vars.dir:
             result = T('file "%(filename)s" created',
-                          dict(filename=full_filename[len(path):]))
+                       dict(filename=full_filename[len(path):]))
         else:
             session.flash = T('file "%(filename)s" created',
-                          dict(filename=full_filename[len(path):]))
+                              dict(filename=full_filename[len(path):]))
         vars = {}
         if request.vars.id:
             vars['id'] = request.vars.id
         if request.vars.app:
             vars['app'] = request.vars.app
         redirect(URL('edit',
-                 args=[os.path.join(request.vars.location, filename)], vars=vars))
+                     args=[os.path.join(request.vars.location, filename)], vars=vars))
 
-    except Exception, e:
+    except Exception as e:
         if not isinstance(e, HTTP):
             session.flash = T('cannot create file')
 
     if request.vars.dir:
         response.flash = result
         response.headers['web2py-component-content'] = 'append'
-        response.headers['web2py-component-command'] = """
-            $.web2py.invalidate('#files_menu');
-            load_file('%s');
-            $.web2py.enableElement($('#form form').find($.web2py.formInputClickSelector));
-        """ % URL('edit', args=[app,request.vars.dir,filename])
+        response.headers['web2py-component-command'] = "%s %s %s" % (
+            "$.web2py.invalidate('#files_menu');",
+            "load_file('%s');" % URL('edit', args=[app, request.vars.dir, filename]),
+            "$.web2py.enableElement($('#form form').find($.web2py.formInputClickSelector));")
         return ''
     else:
-    	redirect(request.vars.sender + anchor)
+        redirect(request.vars.sender + anchor)
 
 
 def listfiles(app, dir, regexp='.*\.py$'):
-	files = sorted(
-         listdir(apath('%(app)s/%(dir)s/' % {'app':app, 'dir':dir}, r=request), regexp))
-	files = [x.replace('\\', '/') for x in files if not x.endswith('.bak')]
-	return files
-      
-def editfile(path,file,vars={}, app = None):
-	args=(path,file) if 'app' in vars else (app,path,file)
-	url = URL('edit', args=args, vars=vars)
-	return A(file, _class='editor_filelink', _href=url, _style='word-wrap: nowrap;')
-      
+    files = sorted(
+        listdir(apath('%(app)s/%(dir)s/' % {'app': app, 'dir': dir}, r=request), regexp))
+    files = [x.replace('\\', '/') for x in files if not x.endswith('.bak')]
+    return files
+
+
+def editfile(path, file, vars={}, app=None):
+    args = (path, file) if 'app' in vars else (app, path, file)
+    url = URL('edit', args=args, vars=vars)
+    return A(file, _class='editor_filelink', _href=url, _style='word-wrap: nowrap;')
+
+
 def files_menu():
-	app = request.vars.app or 'welcome'
-	dirs=[{'name':'models', 'reg':'.*\.py$'},
-      	  {'name':'controllers', 'reg':'.*\.py$'},
-      	  {'name':'views', 'reg':'[\w/\-]+(\.\w+)+$'},
-      	  {'name':'modules', 'reg':'.*\.py$'},
-      	  {'name':'static', 'reg': '[^\.#].*'}]
-	result_files = []
-	for dir in dirs:
-		result_files.append(TAG[''](LI(dir['name'], _class="nav-header component", _onclick="collapse('" + dir['name'] + "_files');"),
-            			  LI(UL(*[LI(editfile(dir['name'], f, dict(id=dir['name'] + f.replace('.','__')), app), _style="overflow:hidden", _id=dir['name']+"__"+f.replace('.','__')) 
-            			  		for f in listfiles(app, dir['name'], regexp=dir['reg'])], 
-            			  		_class="nav nav-list small-font"),
-            			  	 _id=dir['name'] + '_files', _style="display: none;"))) 
-	return dict(result_files = result_files)
-	
+    app = request.vars.app or 'welcome'
+    dirs = [{'name': 'models', 'reg': '.*\.py$'},
+            {'name': 'controllers', 'reg': '.*\.py$'},
+            {'name': 'views', 'reg': '[\w/\-]+(\.\w+)+$'},
+            {'name': 'modules', 'reg': '.*\.py$'},
+            {'name': 'static', 'reg': '[^\.#].*'},
+            {'name': 'private', 'reg': '.*\.py$'}]
+    result_files = []
+    for dir in dirs:
+        result_files.append(TAG[''](LI(dir['name'], _class="nav-header component", _onclick="collapse('" + dir['name'] + "_files');"),
+                                    LI(UL(*[LI(editfile(dir['name'], f, dict(id=dir['name'] + f.replace('.', '__')), app), _style="overflow:hidden", _id=dir['name'] + "__" + f.replace('.', '__'))
+                                            for f in listfiles(app, dir['name'], regexp=dir['reg'])],
+                                          _class="nav nav-list small-font"),
+                                       _id=dir['name'] + '_files', _style="display: none;")))
+    return dict(result_files=result_files)
+
+
 def upload_file():
     """ File uploading handler """
     if request.vars and not request.vars.token == session.token:
@@ -1509,7 +1568,7 @@ def upload_file():
         if filename:
             d = dict(filename=filename[len(path):])
         else:
-            d = dict(filename='unkown')
+            d = dict(filename='unknown')
         session.flash = T('cannot upload file "%(filename)s"', d)
 
     redirect(request.vars.sender)
@@ -1519,13 +1578,12 @@ def errors():
     """ Error handler """
     import operator
     import os
-    import pickle
     import hashlib
 
     app = get_app()
     if is_gae:
         method = 'dbold' if ('old' in
-                     (request.args(1) or '')) else 'dbnew'
+                             (request.args(1) or '')) else 'dbnew'
     else:
         method = request.args(1) or 'new'
     db_ready = {}
@@ -1549,7 +1607,7 @@ def errors():
             if not os.path.isfile(fullpath):
                 continue
             try:
-                fullpath_file = open(fullpath, 'r')
+                fullpath_file = safe_open(fullpath, 'rb')
                 try:
                     error = pickle.load(fullpath_file)
                 finally:
@@ -1559,7 +1617,7 @@ def errors():
             except EOFError:
                 continue
 
-            hash = hashlib.md5(error['traceback']).hexdigest()
+            hash = hashlib.md5(to_bytes(error['traceback'])).hexdigest()
 
             if hash in delete_hashes:
                 os.unlink(fullpath)
@@ -1568,7 +1626,7 @@ def errors():
                     hash2error[hash]['count'] += 1
                 except KeyError:
                     error_lines = error['traceback'].split("\n")
-                    last_line = error_lines[-2] if len(error_lines)>1 else 'unknown'
+                    last_line = error_lines[-2] if len(error_lines) > 1 else 'unknown'
                     error_causer = os.path.split(error['layer'])[1]
                     hash2error[hash] = dict(count=1, pickel=error,
                                             causer=error_causer,
@@ -1607,10 +1665,10 @@ def errors():
                         last_line = error_lines[-2]
                         error_causer = os.path.split(error['layer'])[1]
                         hash2error[hash] = dict(count=1,
-                            pickel=error, causer=error_causer,
-                            last_line=last_line, hash=hash,
-                            ticket=fn.ticket_id)
-            except AttributeError, e:
+                                                pickel=error, causer=error_causer,
+                                                last_line=last_line, hash=hash,
+                                                ticket=fn.ticket_id)
+            except AttributeError as e:
                 tk_db(tk_table.id == fn.id).delete()
                 tk_db.commit()
 
@@ -1626,11 +1684,11 @@ def errors():
                 tk_db(tk_table.ticket_id == item[7:]).delete()
                 tk_db.commit()
         tickets_ = tk_db(tk_table.id > 0).select(tk_table.ticket_id,
-            tk_table.created_datetime,
-            orderby=~tk_table.created_datetime)
+                                                 tk_table.created_datetime,
+                                                 orderby=~tk_table.created_datetime)
         tickets = [row.ticket_id for row in tickets_]
         times = dict([(row.ticket_id, row.created_datetime) for
-            row in tickets_])
+                      row in tickets_])
         return dict(app=app, tickets=tickets, method=method,
                     times=times, db_ready=db_ready)
 
@@ -1654,7 +1712,7 @@ def get_ticket_storage(app):
     private_folder = apath('%s/private' % app, r=request)
     ticket_file = os.path.join(private_folder, 'ticket_storage.txt')
     if os.path.exists(ticket_file):
-        db_string = open(ticket_file).read()
+        db_string = safe_open(ticket_file).read()
         db_string = db_string.strip().replace('\r', '').replace('\n', '')
     elif is_gae:
         # use Datastore as fallback if there is no ticket_file
@@ -1688,9 +1746,9 @@ def make_link(path):
         for key in editable.keys():
             check_extension = folder.endswith("%s/%s" % (app, key))
             if ext.lower() == editable[key] and check_extension:
-                return A('"' + tryFile + '"',
-                         _href=URL(r=request,
-                         f='edit/%s/%s/%s' % (app, key, filename))).xml()
+                return to_native(A('"' + tryFile + '"',
+                                   _href=URL(r=request,
+                                   f='edit/%s/%s/%s' % (app, key, filename))).xml())
     return ''
 
 
@@ -1807,7 +1865,6 @@ def user():
 
 def reload_routes():
     """ Reload routes.py """
-    import gluon.rewrite
     gluon.rewrite.load()
     redirect(URL('site'))
 
@@ -1836,7 +1893,7 @@ def bulk_register():
         redirect(URL('site'))
     return locals()
 
-### Begin experimental stuff need fixes:
+# Begin experimental stuff need fixes:
 # 1) should run in its own process - cannot os.chdir
 # 2) should not prompt user at console
 # 3) should give option to force commit and not reuqire manual merge
@@ -1903,26 +1960,31 @@ def git_push():
             redirect(URL('site'))
     return dict(app=app, form=form)
 
+
 def plugins():
     app = request.args(0)
-    from serializers import loads_json
+    from gluon.serializers import loads_json
     if not session.plugins:
         try:
-            rawlist = urllib.urlopen("http://www.web2pyslices.com/" +
-                                     "public/api.json/action/list/content/Package?package" +
-                                     "_type=plugin&search_index=false").read()
+            rawlist = urlopen("http://www.web2pyslices.com/" +
+                              "public/api.json/action/list/content/Package?package" +
+                              "_type=plugin&search_index=false").read()
             session.plugins = loads_json(rawlist)
         except:
             response.flash = T('Unable to download the list of plugins')
             session.plugins = []
     return dict(plugins=session.plugins["results"], app=request.args(0))
 
+
 def install_plugin():
     app = request.args(0)
     source = request.vars.source
     plugin = request.vars.plugin
     if not (source and app):
         raise HTTP(500, T("Invalid request"))
+    # make sure no XSS attacks in source
+    if not source.lower().split('://')[0] in ('http','https'):
+        raise HTTP(500, T("Invalid request"))
     form = SQLFORM.factory()
     result = None
     if form.process().accepted:
@@ -1932,12 +1994,11 @@ def install_plugin():
                 source.split("web2py.plugin.")[-1].split(".w2p")[0]
         else:
             filename = "web2py.plugin.%s.w2p" % cleanpath(plugin)
-        if plugin_install(app, urllib.urlopen(source),
+        if plugin_install(app, urlopen(source),
                           request, filename):
             session.flash = T('New plugin installed: %s', filename)
         else:
             session.flash = \
                 T('unable to install plugin "%s"', filename)
-        redirect(URL(f="plugins", args=[app,]))
+        redirect(URL(f="plugins", args=[app, ]))
     return dict(form=form, app=app, plugin=plugin, source=source)
-

applications/admin/controllers/pythonanywhere.py

@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+import base64
+import os
+import re
+import gzip
+import tarfile
+from gluon.contrib.simplejsonrpc import ServerProxy
+from gluon._compat import StringIO, ProtocolError
+
+def deploy():
+    response.title = T('Deploy to pythonanywhere')
+    return {}
+
+
+def create_account():
+    """ Create a PythonAnywhere account """
+    if not request.vars:
+        raise HTTP(400)
+    
+    if request.vars.username and request.vars.web2py_admin_password:
+        # Check if web2py is already there otherwise we get an error 500 too.
+        client = ServerProxy('https://%(username)s:%(web2py_admin_password)s@%(username)s.pythonanywhere.com/admin/webservices/call/jsonrpc' % request.vars)
+        try:
+            if client.login() is True:
+                return response.json({'status': 'ok'})
+        except ProtocolError as error:
+            pass
+
+    import urllib, urllib2
+    url = 'https://www.pythonanywhere.com/api/web2py/create_account'
+    data = urllib.urlencode(request.vars)
+    req = urllib2.Request(url, data)
+    
+    try:
+        reply = urllib2.urlopen(req)
+    except urllib2.HTTPError as error:
+        if error.code == 400:
+            reply = error
+        elif error.code == 500:
+            return response.json({'status':'error', 'errors':{'username': ['An App other than web2py is installed in the domain %(username)s.pythonanywhere.com' % request.vars]}})
+        else:
+            raise
+    response.headers['Content-Type'] = 'application/json'
+    return reply.read()
+
+
+def list_apps():
+    """ Get a list of apps both remote and local """
+    if not request.vars.username or not request.vars.password:
+        raise HTTP(400)
+    client = ServerProxy('https://%(username)s:%(password)s@%(username)s.pythonanywhere.com/admin/webservices/call/jsonrpc' % request.vars)
+    regex = re.compile('^\w+$')
+    local = [f for f in os.listdir(apath(r=request)) if regex.match(f)]
+    try:
+        pythonanywhere = client.list_apps()
+    except ProtocolError as error:
+        raise HTTP(error.errcode)
+    return response.json({'local': local, 'pythonanywhere': pythonanywhere})
+
+
+def bulk_install():
+    """ Install a list of apps """
+
+    def b64pack(app):
+        """
+        Given an app's name, return the base64 representation of its packed version.
+        """
+        folder = apath(app, r=request)
+        tmpfile = StringIO()
+        tar = tarfile.TarFile(fileobj=tmpfile, mode='w')
+        try:
+            filenames = listdir(folder, '^[\w\.\-]+$', add_dirs=True, 
+                                exclude_content_from=['cache', 'sessions', 'errors'])
+            for fname in filenames:
+                tar.add(os.path.join(folder, fname), fname, False)
+        finally:
+            tar.close()
+        tmpfile.seek(0)
+        gzfile = StringIO()
+        w2pfp = gzip.GzipFile(fileobj=gzfile, mode='wb')
+        w2pfp.write(tmpfile.read())
+        w2pfp.close()
+        gzfile.seek(0)
+        return base64.b64encode(gzfile.read())
+
+    request.vars.apps = request.vars['apps[]']
+    if not request.vars.apps or not request.vars.username or not request.vars.password:
+        raise HTTP(400)
+    if not isinstance(request.vars.apps, list):
+        request.vars.apps = [request.vars.apps]  # Only one app selected
+
+    client = ServerProxy('https://%(username)s:%(password)s@%(username)s.pythonanywhere.com/admin/webservices/call/jsonrpc' % request.vars)
+
+    for app in request.vars.apps:
+        try:
+            client.install(app, app+'.w2p', b64pack(app))
+        except ProtocolError as error:
+            raise HTTP(error.errcode)
+
+    return response.json({'status': 'ok'}) 

applications/admin/controllers/shell.py

@@ -1,51 +0,0 @@
-import sys
-import cStringIO
-import gluon.contrib.shell
-import code
-import thread
-import cgi
-from gluon.shell import env
-
-if DEMO_MODE or MULTI_USER_MODE:
-    session.flash = T('disabled in demo mode')
-    redirect(URL('default', 'site'))
-
-FE = 10 ** 9
-
-
-def index():
-    app = request.args(0) or 'admin'
-    reset()
-    return dict(app=app)
-
-
-def callback():
-    app = request.args[0]
-    command = request.vars.statement
-    escape = command[:1] != '!'
-    history = session['history:' + app] = session.get(
-        'history:' + app, gluon.contrib.shell.History())
-    if not escape:
-        command = command[1:]
-    if command == '%reset':
-        reset()
-        return '*** reset ***'
-    elif command[0] == '%':
-        try:
-            command = session['commands:' + app][int(command[1:])]
-        except ValueError:
-            return ''
-    session['commands:' + app].append(command)
-    environ = env(app, True, extra_request=dict(is_https=request.is_https))
-    output = gluon.contrib.shell.run(history, command, environ)
-    k = len(session['commands:' + app]) - 1
-    #output = PRE(output)
-    #return TABLE(TR('In[%i]:'%k,PRE(command)),TR('Out[%i]:'%k,output))
-    return cgi.escape('In [%i] : %s%s\n' % (k + 1, command, output))
-
-
-def reset():
-    app = request.args(0) or 'admin'
-    session['commands:' + app] = []
-    session['history:' + app] = gluon.contrib.shell.History()
-    return 'done'

applications/admin/controllers/webservices.py

@@ -7,15 +7,11 @@ import platform
 import time
 import base64
 import os
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from gluon._compat import StringIO
 
 
 service = Service(globals())
 
-
 @service.jsonrpc
 def login():
     "dummy function to test credentials"
@@ -85,44 +81,44 @@ def install(app_name, filename, data, overwrite=True):
 
 @service.jsonrpc
 def attach_debugger(host='localhost', port=6000, authkey='secret password'):
-    import gluon.contrib.qdb as qdb
+    import gluon.contrib.dbg as dbg
     import gluon.debug
     from multiprocessing.connection import Listener
 
     if isinstance(authkey, unicode):
         authkey = authkey.encode('utf8')
 
-    if not hasattr(gluon.debug, 'qdb_listener'):
+    if not hasattr(gluon.debug, 'dbg_listener'):
         # create a remote debugger server and wait for connection
         address = (host, port)     # family is deduced to be 'AF_INET'
-        gluon.debug.qdb_listener = Listener(address, authkey=authkey)
-        gluon.debug.qdb_connection = gluon.debug.qdb_listener.accept()
+        gluon.debug.dbg_listener = Listener(address, authkey=authkey)
+        gluon.debug.dbg_connection = gluon.debug.dbg_listener.accept()
         # create the backend
-        gluon.debug.qdb_debugger = qdb.Qdb(gluon.debug.qdb_connection)
-        gluon.debug.dbg = gluon.debug.qdb_debugger
+        gluon.debug.dbg_debugger = dbg.Qdb(gluon.debug.dbg_connection)
+        gluon.debug.dbg = gluon.debug.dbg_debugger
         # welcome message (this should be displayed on the frontend)
-        print 'debugger connected to', gluon.debug.qdb_listener.last_accepted
+        print('debugger connected to', gluon.debug.dbg_listener.last_accepted)
     return True     # connection successful!
 
 
 @service.jsonrpc
 def detach_debugger():
-    import gluon.contrib.qdb as qdb
+    import gluon.contrib.dbg as dbg
     import gluon.debug
     # stop current debugger
-    if gluon.debug.qdb_debugger:
+    if gluon.debug.dbg_debugger:
         try:
-            gluon.debug.qdb_debugger.do_quit()
+            gluon.debug.dbg_debugger.do_quit()
         except:
             pass
-    if hasattr(gluon.debug, 'qdb_listener'):
-        if gluon.debug.qdb_connection:
-            gluon.debug.qdb_connection.close()
-            del gluon.debug.qdb_connection
-        if gluon.debug.qdb_listener:
-            gluon.debug.qdb_listener.close()
-            del gluon.debug.qdb_listener
-    gluon.debug.qdb_debugger = None
+    if hasattr(gluon.debug, 'dbg_listener'):
+        if gluon.debug.dbg_connection:
+            gluon.debug.dbg_connection.close()
+            del gluon.debug.dbg_connection
+        if gluon.debug.dbg_listener:
+            gluon.debug.dbg_listener.close()
+            del gluon.debug.dbg_listener
+    gluon.debug.dbg_debugger = None
     return True
 
 

applications/admin/controllers/wizard.py

@@ -7,7 +7,7 @@ import pickle
 import urllib
 import glob
 from gluon.admin import app_create, plugin_install
-from gluon.fileutils import abspath, read_file, write_file
+from gluon.fileutils import abspath, read_file, write_file, open_file
 
 
 def reset(session):
@@ -67,7 +67,7 @@ def index():
                              '..', app, 'wizard.metadata'))
             if os.path.exists(meta):
                 try:
-                    metafile = open(meta, 'rb')
+                    metafile = open_file(meta, 'rb')
                     try:
                         session.app = pickle.load(metafile)
                     finally:
@@ -80,7 +80,7 @@ def index():
 
 
 def step1():
-    from gluon.contrib.simplejson import loads
+    from json import loads
     import urllib
     if not session.themes:
         #url = LAYOUTS_APP + '/default/layouts.json'
@@ -402,7 +402,7 @@ db.auth_user.email.requires = (
 
 def fix_db(filename):
     params = dict(session.app['params'])
-    content = read_file(filename, 'rb')
+    content = read_file(filename, 'r')
     if 'auth_user' in session.app['tables']:
         auth_user = make_table('auth_user', session.app['table_auth_user'])
         content = content.replace('sqlite://storage.sqlite',
@@ -424,7 +424,7 @@ auth.settings.login_form = RPXAccount(request,
     domain = settings.login_config.split(':')[0],
     url = "http://%s/%s/default/user/login" % (request.env.http_host,request.application))
 """
-    write_file(filename, content, 'wb')
+    write_file(filename, content, 'w')
 
 
 def make_menu(pages):
@@ -493,7 +493,7 @@ def create(options):
     ### save metadata in newapp/wizard.metadata
     try:
         meta = os.path.join(request.folder, '..', app, 'wizard.metadata')
-        file = open(meta, 'wb')
+        file = open_file(meta, 'wb')
         pickle.dump(session.app, file)
         file.close()
     except IOError:
@@ -516,12 +516,12 @@ def create(options):
             plugin_name = 'web2py.plugin.' + plugin + '.w2p'
             stream = urllib.urlopen(PLUGINS_APP + '/static/' + plugin_name)
             plugin_install(app, stream, request, plugin_name)
-        except Exception, e:
+        except Exception as e:
             session.flash = T("unable to download plugin: %s" % plugin)
 
     ### write configuration file into newapp/models/0.py
     model = os.path.join(request.folder, '..', app, 'models', '0.py')
-    file = open(model, 'wb')
+    file = open_file(model, 'w')
     try:
         file.write("from gluon.storage import Storage\n")
         file.write("settings = Storage()\n\n")
@@ -534,7 +534,7 @@ def create(options):
     ### write configuration file into newapp/models/menu.py
     if options.generate_menu:
         model = os.path.join(request.folder, '..', app, 'models', 'menu.py')
-        file = open(model, 'wb')
+        file = open_file(model, 'w')
         try:
             file.write(make_menu(session.app['pages']))
         finally:
@@ -548,7 +548,7 @@ def create(options):
     if options.generate_model:
         model = os.path.join(
             request.folder, '..', app, 'models', 'db_wizard.py')
-        file = open(model, 'wb')
+        file = open_file(model, 'w')
         try:
             file.write('### we prepend t_ to tablenames and f_ to fieldnames for disambiguity\n\n')
             tables = sort_tables(session.app['tables'])
@@ -564,7 +564,7 @@ def create(options):
     if os.path.exists(model):
         os.unlink(model)
     if options.populate_database and session.app['tables']:
-        file = open(model, 'wb')
+        file = open_file(model, 'w')
         try:
             file.write(populate(session.app['tables']))
         finally:
@@ -574,7 +574,7 @@ def create(options):
     if options.generate_controller:
         controller = os.path.join(
             request.folder, '..', app, 'controllers', 'default.py')
-        file = open(controller, 'wb')
+        file = open_file(controller, 'w')
         try:
             file.write("""# -*- coding: utf-8 -*-
 ### required - do no delete
@@ -594,7 +594,7 @@ def call(): return service()
         for page in session.app['pages']:
             view = os.path.join(
                 request.folder, '..', app, 'views', 'default', page + '.html')
-            file = open(view, 'wb')
+            file = open_file(view, 'w')
             try:
                 file.write(
                     make_view(page, session.app.get('page_' + page, '')))

applications/admin/cron/expire_sessions.py

@@ -1,17 +1,20 @@
-EXPIRATION_MINUTES=60
-DIGITS=('0','1','2','3','4','5','6','7','8','9')
-import os, time, stat, cPickle, logging
-path = os.path.join(request.folder,'sessions')
+
+import os, time, stat, logging
+from gluon._compat import pickle
+
+EXPIRATION_MINUTES = 60
+
+path = os.path.join(request.folder, 'sessions')
 if not os.path.exists(path):
     os.mkdir(path)
 now = time.time()
-for filename in os.listdir(path):
-    fullpath=os.path.join(path,filename)
-    if os.path.isfile(fullpath) and filename.startswith(DIGITS):
+for path, dirs, files in os.walk(path, topdown=False):
+    for x in files:
+        fullpath = os.path.join(path, x)
         try:
-            filetime = os.stat(fullpath)[stat.ST_MTIME] # get it before our io
+            filetime = os.stat(fullpath)[stat.ST_MTIME]  # get it before our io
             try:
-                session_data = cPickle.load(open(fullpath, 'rb+'))
+                session_data = pickle.load(open(fullpath, 'rb+'))
                 expiration = session_data['auth']['expiration']
             except:
                 expiration = EXPIRATION_MINUTES * 60
@@ -19,3 +22,7 @@ for filename in os.listdir(path):
                 os.unlink(fullpath)
         except:
             logging.exception('failure to check %s' % fullpath)
+    for d in dirs:
+        dd = os.path.join(path, d)
+        if not os.listdir(dd):
+            os.rmdir(dd)

applications/admin/languages/af.py

@@ -1,89 +1,582 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'af',
 '!langname!': 'Afrikaanse',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s rows deleted',
 '%s %%{row} updated': '%s rows updated',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '(requires internet access)': '(vereis internet toegang)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(iets soos "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01Searching: **%s** %%{file}': 'Soek: **%s** lêre',
+'Abort': 'Abort',
 'About': 'oor',
 'About application': 'Oor program',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
 'Additional code for your application': 'Additionele kode vir u application',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': 'admin disabled because no admin password',
+'admin disabled because not supported on google app engine': 'admin disabled because not supported on google app engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': 'admin disabled because unable to access password file',
+'Admin is disabled because insecure channel': 'Admin is disabled because insecure channel',
 'Admin language': 'Admin taal',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'administrative interface',
+'Administrator Password:': 'Administrator Password:',
+'and rename it:': 'en verander die naam:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'appadmin is disabled because insecure channel',
+'Application': 'Application',
+'application "%s" uninstalled': 'application "%s" uninstalled',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'application compiled',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
 'Application name:': 'Program naam:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
+'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
+'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Are you sure you want to uninstall application "%s"?': 'Are you sure you want to uninstall application "%s"?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'ATTENTION: you cannot edit the running application!': 'ATTENTION: you cannot edit the running application!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'back',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'cache, errors and sessions cleaned',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
+'Cannot be empty': 'Cannot be empty',
+'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
+'cannot create file': 'cannot create file',
+'cannot upload file "%(filename)s"': 'cannot upload file "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'verander admin wagwoord',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
+'check all': 'check all',
 'Check for upgrades': 'soek vir upgrades',
+'Check to delete': 'Check to delete',
+'Checking for upgrades...': 'Checking for upgrades...',
 'Clean': 'maak skoon',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'collapse/expand all',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'kompileer',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'compiled application removed',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controllers': 'Beheerders',
+'controllers': 'beheerders',
+'Count': 'Count',
 'Create': 'skep',
+'create file with filename:': 'skep lêer met naam:',
+'Create/Upload': 'Create/Upload',
+'created by': 'geskep deur',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': 'crontab',
+'Current request': 'Current request',
+'Current response': 'Current response',
+'Current session': 'Current session',
+'currently running': 'loop tans',
+'currently saved or': 'currently saved or',
+'data uploaded': 'data uploaded',
+'Database': 'Database',
+'Database %s select': 'Database %s select',
+'Database administration': 'Database administration',
+'database administration': 'database administration',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Date and Time': 'Date and Time',
+'db': 'db',
+'Debug': 'Debug',
+'defines tables': 'defines tables',
+'Delete': 'Delete',
+'delete': 'delete',
+'delete all checked': 'delete all checked',
+'delete plugin': 'delete plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'Delete:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
 'Deploy': 'deploy',
 'Deploy on Google App Engine': 'Stuur na Google App Engine toe',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
+'design': 'design',
+'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
+'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
+'Disable': 'Disable',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
+'done!': 'done!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
+'download layouts': 'aflaai layouts',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'aflaai plugins',
+'Download plugins from repository': 'Download plugins from repository',
 'Edit': 'wysig',
+'edit all': 'edit all',
 'Edit application': 'Wysig program',
+'edit controller:': 'edit controller:',
+'Edit current record': 'Edit current record',
+'edit views:': 'edit views:',
+'Editing %s': 'Editing %s',
+'Editing Language file': 'Editing Language file',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
+'Error': 'Error',
+'Error logs for "%(app)s"': 'Error logs for "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
 'Errors': 'foute',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Exception instance attributes',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
+'export as csv file': 'export as csv file',
+'Exports:': 'Exports:',
+'exposes': 'exposes',
+'exposes:': 'exposes:',
+'extends': 'extends',
+'failed to compile file because:': 'failed to compile file because:',
+'failed to reload module because:': 'failed to reload module because:',
+'File': 'File',
+'file "%(filename)s" created': 'file "%(filename)s" created',
+'file "%(filename)s" deleted': 'file "%(filename)s" deleted',
+'file "%(filename)s" uploaded': 'file "%(filename)s" uploaded',
+'file "%s" of %s restored': 'file "%s" of %s restored',
+'file changed on disk': 'file changed on disk',
+'file does not exist': 'file does not exist',
+'file not found': 'file not found',
+'file saved on %(time)s': 'file saved on %(time)s',
+'file saved on %s': 'file saved on %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
+'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'Form has errors': 'Form has errors',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
 'Help': 'hulp',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'Import/Export',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
+'includes': 'includes',
+'Indent with tabs': 'Indent with tabs',
+'inspect attributes': 'inspect attributes',
 'Install': 'installeer',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Geinstalleerde apps',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
+'internal error': 'internal error',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'Internal State',
+'Invalid action': 'Invalid action',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid git repository specified.': 'Invalid git repository specified.',
+'invalid password': 'invalid password',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Invalid Query',
+'invalid request': 'invalid request',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
+'invalid ticket': 'invalid ticket',
+'Key': 'Key',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
+'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
+'Language files (static strings) updated': 'Language files (static strings) updated',
+'languages': 'tale',
 'Languages': 'Tale',
+'Last Revision': 'Last Revision',
+'Last saved on:': 'Last saved on:',
 'License for': 'Lisensie vir',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
+'loading...': 'laai...',
+'Local Apps': 'Local Apps',
+'locals': 'locals',
+'Locals##debug': 'Locals##debug',
+'Login': 'Login',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'Login to the Administrative Interface',
+'Login/Register': 'Login/Register',
 'Logout': 'logout',
+'lost password': 'lost password',
+'Main Menu': 'Main Menu',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
+'merge': 'merge',
 'Models': 'Modelle',
+'models': 'modelle',
+'Modified On': 'Modified On',
 'Modules': 'Modules',
+'modules': 'modules',
+'Multi User Mode': 'Multi User Mode',
+'new application "%s" created': 'new application "%s" created',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'Nuwe app wizard',
+'new plugin installed': 'new plugin installed',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'New Record',
+'new record inserted': 'new record inserted',
 'New simple application': 'Nuwe eenvoudige app',
+'next': 'next',
+'next %s rows': 'next %s rows',
+'NO': 'NO',
+'no changes': 'no changes',
+'No databases in this application': 'No databases in this application',
+'No Interaction yet': 'No Interaction yet',
+'no match': 'no match',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
+'or import from csv file': 'or import from csv file',
+'Original/Translation': 'Original/Translation',
+'Overview': 'Overview',
 'Overwrite installed app': 'skryf oor geinstalleerde program',
 'Pack all': 'pack alles',
+'Pack compiled': 'Pack compiled',
+'Pack custom': 'Pack custom',
+'pack plugin': 'pack plugin',
+'password changed': 'password changed',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Peeking at file',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
+'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
+'Plugin "%s" in application': 'Plugin "%s" in application',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
+'plugins': 'plugins',
 'Plugins': 'Plugins',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Aangedryf deur',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Query:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
+'record does not exist': 'record does not exist',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Reload routes': 'Reload routes',
+'Remove compiled': 'Remove compiled',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
+'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Resolve Conflict file',
+'response': 'response',
+'restart': 'restart',
+'restore': 'restore',
+'return': 'return',
+'Revert': 'Revert',
+'revert': 'revert',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in Table': 'Rows in Table',
+'Rows selected': 'Rows selected',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Running on %s',
+'Save': 'Save',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Saved file hash:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
+'session': 'session',
+'session expired': 'session expired',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
+'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
 'Site': 'site',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
+'some files could not be removed': 'some files could not be removed',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Start searching',
 'Start wizard': 'start wizard',
+'state': 'state',
+'Static': 'Static',
+'static': 'static',
 'Static files': 'Static files',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
+'submit': 'submit',
+'Submit': 'Submit',
+'successful': 'successful',
 'Sure you want to delete this object?': 'Is jy seker jy will hierde object verwyder?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
+'Table': 'Table',
+'Temporary': 'Temporary',
+'test': 'toets',
+'Testing application': 'Testing application',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
+'Theme': 'Theme',
+'There are no controllers': 'There are no controllers',
+'There are no models': 'There are no models',
+'There are no modules': 'There are no modules',
 'There are no plugins': 'Daar is geen plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': 'There are no static files',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'There are no views',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'Hierdie lêre is sonder veranderinge geserved, jou images gaan hier',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Ticket',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'to  previous version.': 'to  previous version.',
 'To create a plugin, name a file/folder plugin_[name]': 'Om n plugin te skep, noem n lêer/gids plugin_[name]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
 'Translation strings for the application': 'Vertaling woorde vir die program',
+'try something like': 'try something like',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Unable to check for upgrades',
+'unable to create application "%s"': 'unable to create application "%s"',
+'unable to delete file "%(filename)s"': 'unable to delete file "%(filename)s"',
+'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download app because:': 'Unable to download app because:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
+'unable to parse csv file': 'unable to parse csv file',
+'unable to uninstall "%s"': 'unable to uninstall "%s"',
+'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
+'uncheck all': 'uncheck all',
 'Uninstall': 'verwyder',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
+'update': 'update',
+'update all languages': 'update all languages',
+'Update:': 'Update:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
+'upload': 'oplaai',
+'Upload': 'Upload',
 'Upload & install packed application': 'Oplaai & install gepakte program',
 'Upload a package:': 'Oplaai n package:',
-'Use an url:': 'Gebruik n url:',
-'Views': 'Views',
-'administrative interface': 'administrative interface',
-'and rename it:': 'en verander die naam:',
-'collapse/expand all': 'collapse/expand all',
-'controllers': 'beheerders',
-'create file with filename:': 'skep lêer met naam:',
-'created by': 'geskep deur',
-'crontab': 'crontab',
-'currently running': 'loop tans',
-'database administration': 'database administration',
-'direction: ltr': 'direction: ltr',
-'download layouts': 'aflaai layouts',
-'download plugins': 'aflaai plugins',
-'exposes': 'exposes',
-'extends': 'extends',
-'filter': 'filter',
-'includes': 'includes',
-'languages': 'tale',
-'loading...': 'laai...',
-'models': 'modelle',
-'modules': 'modules',
-'plugins': 'plugins',
-'shell': 'shell',
-'static': 'static',
-'test': 'toets',
-'update all languages': 'update all languages',
-'upload': 'oplaai',
+'Upload and install packed application': 'Upload and install packed application',
 'upload file:': 'oplaai lêer:',
 'upload plugin file:': 'upload plugin lêer:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
+'Use an url:': 'Gebruik n url:',
+'User': 'User',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
+'variables': 'variables',
+'Version': 'Version',
+'Versioning': 'Versioning',
 'versioning': 'versioning',
+'Views': 'Views',
 'views': 'views',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
+'web2py is up to date': 'web2py is up to date',
+'web2py online debugger': 'web2py online debugger',
 'web2py Recent Tweets': 'web2py Onlangse Tweets',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'YES',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/bg.py

@@ -1,205 +1,239 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'bg',
 '!langname!': 'Български',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s записите бяха изтрити',
 '%s %%{row} updated': '%s записите бяха обновени',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '(requires internet access)': '(requires internet access)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(something like "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
 'A new version of web2py is available': 'A new version of web2py is available',
 'A new version of web2py is available: %s': 'A new version of web2py is available: %s',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
-'ATTENTION: you cannot edit the running application!': 'ATTENTION: you cannot edit the running application!',
+'Abort': 'Abort',
 'About': 'about',
 'About application': 'About application',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
+'additional code for your application': 'additional code for your application',
 'Additional code for your application': 'Additional code for your application',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': 'admin disabled because no admin password',
+'admin disabled because not supported on google app engine': 'admin disabled because not supported on google apps engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': 'admin disabled because unable to access password file',
 'Admin is disabled because insecure channel': 'Admin is disabled because insecure channel',
 'Admin is disabled because unsecure channel': 'Admin is disabled because unsecure channel',
 'Admin language': 'Admin language',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'administrative interface',
 'Administrator Password:': 'Administrator Password:',
+'and rename it (required):': 'and rename it (required):',
+'and rename it:': 'and rename it:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'appadmin is disabled because insecure channel',
+'Application': 'Application',
+'application "%s" uninstalled': 'application "%s" uninstalled',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'application compiled',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
 'Application name:': 'Application name:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
 'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'Are you sure you want to uninstall application "%s"': 'Are you sure you want to uninstall application "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Are you sure you want to uninstall application "%s"?',
 'Are you sure you want to upgrade web2py now?': 'Are you sure you want to upgrade web2py now?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'ATTENTION: you cannot edit the running application!': 'ATTENTION: you cannot edit the running application!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Available databases and tables',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'back',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'cache, errors and sessions cleaned',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
 'Cannot be empty': 'Cannot be empty',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.',
 'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
+'cannot create file': 'cannot create file',
+'cannot upload file "%(filename)s"': 'cannot upload file "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
+'check all': 'check all',
 'Check for upgrades': 'check for upgrades',
 'Check to delete': 'Check to delete',
 'Checking for upgrades...': 'Checking for upgrades...',
 'Clean': 'clean',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
+'click here for online examples': 'щракни тук за онлайн примери',
+'click here for the administrative interface': 'щракни тук за административния интерфейс',
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
+'click to check for upgrades': 'click to check for upgrades',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'collapse/expand all',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'compile',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'compiled application removed',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controllers': 'Controllers',
+'controllers': 'controllers',
+'Count': 'Count',
 'Create': 'create',
+'create file with filename:': 'create file with filename:',
+'create new application:': 'create new application:',
 'Create new simple application': 'Create new simple application',
+'Create/Upload': 'Create/Upload',
+'created by': 'created by',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': 'crontab',
 'Current request': 'Current request',
 'Current response': 'Current response',
 'Current session': 'Current session',
-'DESIGN': 'DESIGN',
-'Date and Time': 'Date and Time',
-'Debug': 'Debug',
-'Delete': 'Delete',
-'Delete:': 'Delete:',
-'Deploy': 'deploy',
-'Deploy on Google App Engine': 'Deploy on Google App Engine',
-'Deploy to OpenShift': 'Deploy to OpenShift',
-'Design for': 'Design for',
-'Disable': 'Disable',
-'EDIT': 'EDIT',
-'Edit': 'edit',
-'Edit application': 'Edit application',
-'Edit current record': 'Edit current record',
-'Editing Language file': 'Editing Language file',
-'Editing file': 'Editing file',
-'Editing file "%s"': 'Editing file "%s"',
-'Enterprise Web Framework': 'Enterprise Web Framework',
-'Error logs for "%(app)s"': 'Error logs for "%(app)s"',
-'Errors': 'errors',
-'Exception instance attributes': 'Exception instance attributes',
-'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
-'Get from URL:': 'Get from URL:',
-'Hello World': 'Здравей, свят',
-'Help': 'help',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
-'Import/Export': 'Import/Export',
-'Install': 'install',
-'Installed applications': 'Installed applications',
-'Internal State': 'Internal State',
-'Invalid Query': 'Невалидна заявка',
-'Invalid action': 'Invalid action',
-'Language files (static strings) updated': 'Language files (static strings) updated',
-'Languages': 'Languages',
-'Last saved on:': 'Last saved on:',
-'License for': 'License for',
-'Login': 'Login',
-'Login to the Administrative Interface': 'Login to the Administrative Interface',
-'Logout': 'logout',
-'Models': 'Models',
-'Modules': 'Modules',
-'NO': 'NO',
-'New Record': 'New Record',
-'New application wizard': 'New application wizard',
-'New simple application': 'New simple application',
-'No databases in this application': 'No databases in this application',
-'Original/Translation': 'Original/Translation',
-'Overwrite installed app': 'overwrite installed app',
-'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
-'Pack all': 'pack all',
-'Pack compiled': 'pack compiled',
-'Peeking at file': 'Peeking at file',
-'Plugin "%s" in application': 'Plugin "%s" in application',
-'Plugins': 'Plugins',
-'Powered by': 'Powered by',
-'Query:': 'Query:',
-'Reload routes': 'Reload routes',
-'Remove compiled': 'remove compiled',
-'Resolve Conflict file': 'Resolve Conflict file',
-'Rows in table': 'Rows in table',
-'Rows selected': 'Rows selected',
-'Running on %s': 'Running on %s',
-'Saved file hash:': 'Saved file hash:',
-'Site': 'site',
-'Start wizard': 'start wizard',
-'Static files': 'Static files',
-'Sure you want to delete this object?': 'Сигурен ли си, че искаш да изтриеш този обект?',
-'TM': 'TM',
-'Testing application': 'Testing application',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
-'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'There are no controllers': 'There are no controllers',
-'There are no models': 'There are no models',
-'There are no modules': 'There are no modules',
-'There are no plugins': 'There are no plugins',
-'There are no static files': 'There are no static files',
-'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
-'There are no views': 'There are no views',
-'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'This is the %(filename)s template': 'This is the %(filename)s template',
-'Ticket': 'Ticket',
-'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
-'Translation strings for the application': 'Translation strings for the application',
-'Unable to check for upgrades': 'Unable to check for upgrades',
-'Unable to download': 'Unable to download',
-'Unable to download app because:': 'Unable to download app because:',
-'Unable to download because': 'Unable to download because',
-'Uninstall': 'uninstall',
-'Update:': 'Update:',
-'Upload & install packed application': 'Upload & install packed application',
-'Upload a package:': 'Upload a package:',
-'Upload and install packed application': 'Upload and install packed application',
-'Upload existing application': 'Upload existing application',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
-'Use an url:': 'Use an url:',
-'Version': 'Version',
-'Views': 'Views',
-'Web Framework': 'Web Framework',
-'Welcome to web2py': 'Добре дошъл в web2py',
-'YES': 'YES',
-'additional code for your application': 'additional code for your application',
-'admin disabled because no admin password': 'admin disabled because no admin password',
-'admin disabled because not supported on google app engine': 'admin disabled because not supported on google apps engine',
-'admin disabled because unable to access password file': 'admin disabled because unable to access password file',
-'administrative interface': 'administrative interface',
-'and rename it (required):': 'and rename it (required):',
-'and rename it:': 'and rename it:',
-'appadmin': 'appadmin',
-'appadmin is disabled because insecure channel': 'appadmin is disabled because insecure channel',
-'application "%s" uninstalled': 'application "%s" uninstalled',
-'application compiled': 'application compiled',
-'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
-'arguments': 'arguments',
-'back': 'back',
-'cache': 'cache',
-'cache, errors and sessions cleaned': 'cache, errors and sessions cleaned',
-'cannot create file': 'cannot create file',
-'cannot upload file "%(filename)s"': 'cannot upload file "%(filename)s"',
-'check all': 'check all',
-'click here for online examples': 'щракни тук за онлайн примери',
-'click here for the administrative interface': 'щракни тук за административния интерфейс',
-'click to check for upgrades': 'click to check for upgrades',
-'code': 'code',
-'collapse/expand all': 'collapse/expand all',
-'compiled application removed': 'compiled application removed',
-'controllers': 'controllers',
-'create file with filename:': 'create file with filename:',
-'create new application:': 'create new application:',
-'created by': 'created by',
-'crontab': 'crontab',
 'currently running': 'currently running',
 'currently saved or': 'currently saved or',
 'data uploaded': 'данните бяха качени',
+'Database': 'Database',
 'database': 'database',
+'Database %s select': 'Database %s select',
 'database %s select': 'database %s select',
+'Database administration': 'Database administration',
 'database administration': 'database administration',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Date and Time': 'Date and Time',
 'db': 'дб',
+'Debug': 'Debug',
 'defines tables': 'defines tables',
+'Delete': 'Delete',
 'delete': 'delete',
 'delete all checked': 'delete all checked',
 'delete plugin': 'delete plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'Delete:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
+'Deploy': 'deploy',
+'Deploy on Google App Engine': 'Deploy on Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
 'design': 'дизайн',
+'DESIGN': 'DESIGN',
+'Design for': 'Design for',
+'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
 'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
+'Disable': 'Disable',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
 'done!': 'готово!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
 'download layouts': 'download layouts',
+'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
+'Download plugins from repository': 'Download plugins from repository',
+'EDIT': 'EDIT',
+'Edit': 'edit',
+'edit all': 'edit all',
+'Edit application': 'Edit application',
 'edit controller': 'edit controller',
+'edit controller:': 'edit controller:',
+'Edit current record': 'Edit current record',
 'edit views:': 'edit views:',
+'Editing %s': 'Editing %s',
+'Editing file': 'Editing file',
+'Editing file "%s"': 'Editing file "%s"',
+'Editing Language file': 'Editing Language file',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
+'Enterprise Web Framework': 'Enterprise Web Framework',
+'Error': 'Error',
+'Error logs for "%(app)s"': 'Error logs for "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'errors',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Exception instance attributes',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'export as csv file',
+'Exports:': 'Exports:',
 'exposes': 'exposes',
+'exposes:': 'exposes:',
 'extends': 'extends',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module': 'failed to reload module',
 'failed to reload module because:': 'failed to reload module because:',
+'File': 'File',
 'file "%(filename)s" created': 'file "%(filename)s" created',
 'file "%(filename)s" deleted': 'file "%(filename)s" deleted',
 'file "%(filename)s" uploaded': 'file "%(filename)s" uploaded',
@@ -207,80 +241,400 @@
 'file "%s" of %s restored': 'file "%s" of %s restored',
 'file changed on disk': 'file changed on disk',
 'file does not exist': 'file does not exist',
+'file not found': 'file not found',
 'file saved on %(time)s': 'file saved on %(time)s',
 'file saved on %s': 'file saved on %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
 'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'Form has errors': 'Form has errors',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
+'Get from URL:': 'Get from URL:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Hello World': 'Здравей, свят',
+'Help': 'help',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'htmledit',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'Import/Export',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'includes',
+'Indent with tabs': 'Indent with tabs',
 'insert new': 'insert new',
 'insert new %s': 'insert new %s',
+'inspect attributes': 'inspect attributes',
+'Install': 'install',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': 'Installed applications',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'internal error',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'Internal State',
+'Invalid action': 'Invalid action',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'invalid password',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Невалидна заявка',
 'invalid request': 'невалидна заявка',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'invalid ticket',
+'Key': 'Key',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
+'Language files (static strings) updated': 'Language files (static strings) updated',
 'languages': 'languages',
+'Languages': 'Languages',
 'languages updated': 'languages updated',
+'Last Revision': 'Last Revision',
+'Last saved on:': 'Last saved on:',
+'License for': 'License for',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': 'loading...',
+'Local Apps': 'Local Apps',
+'locals': 'locals',
+'Locals##debug': 'Locals##debug',
+'Login': 'Login',
 'login': 'login',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'Login to the Administrative Interface',
+'Login/Register': 'Login/Register',
+'Logout': 'logout',
+'lost password': 'lost password',
+'Main Menu': 'Main Menu',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
 'merge': 'merge',
+'Models': 'Models',
 'models': 'models',
+'Modified On': 'Modified On',
+'Modules': 'Modules',
 'modules': 'modules',
+'Multi User Mode': 'Multi User Mode',
 'new application "%s" created': 'new application "%s" created',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
+'New application wizard': 'New application wizard',
 'new plugin installed': 'new plugin installed',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'New Record',
 'new record inserted': 'новият запис беше добавен',
+'New simple application': 'New simple application',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': 'next 100 rows',
+'NO': 'NO',
+'no changes': 'no changes',
+'No databases in this application': 'No databases in this application',
+'No Interaction yet': 'No Interaction yet',
 'no match': 'no match',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'or import from csv file',
 'or provide app url:': 'or provide app url:',
 'or provide application url:': 'or provide application url:',
+'Original/Translation': 'Original/Translation',
+'Overview': 'Overview',
+'Overwrite installed app': 'overwrite installed app',
+'Pack all': 'pack all',
+'Pack compiled': 'pack compiled',
+'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
+'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
 'password changed': 'password changed',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Peeking at file',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
+'Plugin "%s" in application': 'Plugin "%s" in application',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
 'plugins': 'plugins',
+'Plugins': 'Plugins',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Powered by',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': 'previous 100 rows',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Query:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
 'record': 'record',
 'record does not exist': 'записът не съществува',
 'record id': 'record id',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Reload routes': 'Reload routes',
+'Remove compiled': 'remove compiled',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
+'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Resolve Conflict file',
+'response': 'response',
+'restart': 'restart',
 'restore': 'restore',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'revert',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in table': 'Rows in table',
+'Rows in Table': 'Rows in Table',
+'Rows selected': 'Rows selected',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Running on %s',
+'Save': 'Save',
 'save': 'save',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Saved file hash:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'selected',
+'session': 'session',
 'session expired': 'session expired',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': 'site',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': 'some files could not be removed',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Start searching',
+'Start wizard': 'start wizard',
 'state': 'състояние',
+'Static': 'Static',
 'static': 'static',
+'Static files': 'Static files',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
 'submit': 'submit',
+'Submit': 'Submit',
+'successful': 'successful',
+'Sure you want to delete this object?': 'Сигурен ли си, че искаш да изтриеш този обект?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'table',
+'Table': 'Table',
+'Temporary': 'Temporary',
 'test': 'test',
+'Testing application': 'Testing application',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'the application logic, each URL path is mapped in one exposed function in the controller',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'the data representation, define database tables and sets': 'the data representation, define database tables and sets',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
 'the presentations layer, views are also known as templates': 'the presentations layer, views are also known as templates',
+'Theme': 'Theme',
+'There are no controllers': 'There are no controllers',
+'There are no models': 'There are no models',
+'There are no modules': 'There are no modules',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': 'There are no static files',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'There are no views',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'these files are served without processing, your images go here',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'This is the %(filename)s template',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Ticket',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'TM': 'TM',
 'to  previous version.': 'to  previous version.',
+'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
 'translation strings for the application': 'translation strings for the application',
+'Translation strings for the application': 'Translation strings for the application',
 'try': 'try',
 'try something like': 'try something like',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Unable to check for upgrades',
 'unable to create application "%s"': 'unable to create application "%s"',
 'unable to delete file "%(filename)s"': 'unable to delete file "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download': 'Unable to download',
+'Unable to download app because:': 'Unable to download app because:',
+'Unable to download because': 'Unable to download because',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'не е възможна обработката на csv файла',
 'unable to uninstall "%s"': 'unable to uninstall "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'uncheck all',
+'Uninstall': 'uninstall',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'update',
 'update all languages': 'update all languages',
+'Update:': 'Update:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'upgrade web2py now',
 'upload': 'upload',
+'Upload': 'Upload',
+'Upload & install packed application': 'Upload & install packed application',
+'Upload a package:': 'Upload a package:',
+'Upload and install packed application': 'Upload and install packed application',
 'upload application:': 'upload application:',
+'Upload existing application': 'Upload existing application',
 'upload file:': 'upload file:',
 'upload plugin file:': 'upload plugin file:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
+'Use an url:': 'Use an url:',
+'User': 'User',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Version': 'Version',
+'Versioning': 'Versioning',
 'versioning': 'versioning',
 'view': 'view',
+'Views': 'Views',
 'views': 'views',
-'web2py Recent Tweets': 'web2py Recent Tweets',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py is up to date',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'web2py Recent Tweets',
+'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome to web2py': 'Добре дошъл в web2py',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'YES',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/de.py

@@ -1,107 +1,167 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'de',
 '!langname!': 'Deutsch',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"Update" ist ein optionaler Ausdruck wie "Feld1 = \'newvalue". JOIN Ergebnisse können nicht aktualisiert oder gelöscht werden',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s %%{row} Zeilen gelöscht',
 '%s %%{row} updated': '%s %%{row} Zeilen aktualisiert',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
 '%Y-%m-%d': '%d.%m.%Y',
 '%Y-%m-%d %H:%M:%S': '%d.%m.%Y %H:%M:%S',
-'(requires internet access)': '(Internet Zugang wir benötigt)',
-'(requires internet access, experimental)': '(benötigt Internet Zugang)',
+'(requires internet access)': '(Benötigt Internetzugang)',
+'(requires internet access, experimental)': '(Benötigt Internetzugang)',
 '(something like "it-it")': '(so etwas wie "it-it")',
-'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'(version %s)': '(version %s)',
+'?': '?',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(Datei **gluon/contrib/plural_rules/%s.py** wurde nicht gefunden)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'Ein Fehler ist aufgetreten, bitte [[reload %s]] sie die Seite erneut',
 '@markmin\x01Searching: **%s** %%{file}': '@markmin\x01Suche: **%s** Dateien',
 'A new version of web2py is available': 'Eine neue Version von web2py ist verfügbar',
 'A new version of web2py is available: %s': 'Eine neue Version von web2py ist verfügbar: %s',
 'Abort': 'Abbrechen',
-'About': 'über',
-'About application': 'über die Anwendung',
-'Additional code for your application': 'zusätzlicher Code für Ihre Anwendung',
+'About': 'Über',
+'About application': 'Über die Anwendung',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
+'Additional code for your application': 'Zusätzlicher Code für Ihre Anwendung',
+'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'admin ist deaktiviert, weil kein Admin-Passwort gesetzt ist',
+'admin disabled because not supported on google app engine': 'admin disabled because not supported on google app engine',
 'admin disabled because not supported on google apps engine': 'admin ist deaktiviert, es existiert dafür keine Unterstützung auf der google apps engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'admin ist deaktiviert, weil kein Zugriff auf die Passwortdatei besteht',
 'Admin is disabled because insecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
 'Admin is disabled because unsecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
 'Admin language': 'Admin-Sprache',
+'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'Administrative Schnittstelle',
 'Administrator Password:': 'Administrator Passwort:',
 'An error occured, please %s the page': 'Ein Fehler ist aufgetereten, bitte %s die Seite',
 'and rename it (required):': 'und benenne sie um (erforderlich):',
 'and rename it:': ' und benenne sie um:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
 'Application': 'Anwendung',
 'application "%s" uninstalled': 'Anwendung "%s" deinstalliert',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
 'application compiled': 'Anwendung kompiliert',
-'application is compiled and cannot be designed': 'Die Anwendung ist kompiliert kann deswegen nicht mehr geändert werden',
-'Application name:': 'Name der Applikation:',
-'are not used': 'wird nicht verwendet',
-'are not used yet': 'wird bisher nicht verwendet',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'Die Anwendung ist kompiliert und kann deswegen nicht mehr geändert werden',
+'Application name:': 'Name der Anwendung:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'werden nicht verwendet',
+'are not used yet': 'werden bisher nicht verwendet',
 'Are you sure you want to delete file "%s"?': 'Sind Sie sich sicher, dass Sie diese Datei löschen wollen "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
 'Are you sure you want to delete this object?': 'Sind Sie sich sicher, dass Sie dieses Objekt löschen wollen?',
 'Are you sure you want to uninstall application "%s"': 'Sind Sie sich sicher, dass Sie diese Anwendung deinstallieren wollen "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Sind Sie sich sicher, dass Sie diese Anwendung deinstallieren wollen "%s"?',
 'Are you sure you want to upgrade web2py now?': 'Sind Sie sich sicher, dass Sie web2py jetzt upgraden möchten?',
+'Are you sure?': 'Are you sure?',
 'arguments': 'arguments',
-'at char %s': 'at char %s',
-'at line %s': 'at line %s',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ACHTUNG: Die Einwahl benötigt eine sichere (HTTPS) Verbindung. Es sei denn sie läuft Lokal(localhost).',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ACHTUNG: Testen ist nicht threadsicher. Führen sie also nicht mehrere Tests gleichzeitig aus.',
+'at char %s': 'bei Zeichen %s',
+'at line %s': 'in Linie %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ACHTUNG: Die Einwahl benötigt eine sichere (HTTPS) Verbindung. Es sei denn sie läuft Lokal (localhost).',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ACHTUNG: Testen ist nicht threadsicher. Führen Sie also nicht mehrere Tests gleichzeitig aus.',
 'ATTENTION: This is an experimental feature and it needs more testing.': 'ACHTUNG: Dies ist eine experimentelle Funktion und benötigt noch weitere Tests.',
 'ATTENTION: you cannot edit the running application!': 'ACHTUNG: Eine laufende Anwendung kann nicht editiert werden!',
 'Authentication': 'Authentifizierung',
-'Available databases and tables': 'verfügbare Datenbanken und Tabellen',
-'back': 'zurück',
-'beautify': 'verschönern',
-'cache': 'Pufferspeicher',
+'Autocomplete Python Code': 'Autocomplete Python Code',
+'Available databases and tables': 'Verfügbare Datenbanken und Tabellen',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'Zurück',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'beautify': 'Verschönern',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'Zwischenspeicher',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
 'cache, errors and sessions cleaned': 'Zwischenspeicher (cache), Fehler und Sitzungen (sessions) gelöscht',
 'call': 'Aufruf',
 'can be a git repo': 'kann ein git Repository sein',
-'Cancel': 'Cancel',
+'Cancel': 'Abbrechen',
 'Cannot be empty': 'Darf nicht leer sein',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Nicht Kompilierbar:Es sind Fehler in der Anwendung. Beseitigen Sie die Fehler und versuchen Sie es erneut.',
+'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Nicht Kompilierbar: Es sind Fehler in der Anwendung. Beseitigen Sie die Fehler und versuchen Sie es erneut.',
+'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
 'cannot create file': 'Kann Datei nicht erstellen',
 'cannot upload file "%(filename)s"': 'Kann Datei nicht Hochladen "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Administrator-Passwort ändern',
+'change editor settings': 'Editoreinstellungen ändern',
 'Change Password': 'Passwort ändern',
 'change password': 'Passwort ändern',
+'Changelog': 'Changelog',
 'check all': 'alles auswählen',
-'Check for upgrades': 'check for upgrades',
+'Check for upgrades': 'Versionsüberprüfung',
 'Check to delete': 'Markiere zum löschen',
-'Checking for upgrades...': 'Auf Updates überprüfen...',
-'Clean': 'leeren',
+'Checking for upgrades...': 'Überprüfe auf Updates...',
+'Clean': 'Leeren',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
 'click here for online examples': 'hier klicken für online Beispiele',
 'click here for the administrative interface': 'hier klicken für die Administrationsoberfläche ',
 'Click row to expand traceback': 'Klicke auf die Zeile für Fehlerverfolgung',
+'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'hier klicken um nach Upgrades zu suchen',
 'Client IP': 'Client IP',
 'code': 'code',
+'Code listing': 'Code listing',
 'collapse/expand all': 'alles zu- bzw. aufklappen',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'kompilieren',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'kompilierte Anwendung gelöscht',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controller': 'Controller',
-'Controllers': 'Controller',
-'controllers': 'Controllers',
+'Controllers': 'Controllers',
+'controllers': 'controllers',
 'Copyright': 'Urheberrecht',
 'Count': 'Anzahl',
-'Create': 'erstellen',
-'create file with filename:': 'erzeuge Datei mit Dateinamen:',
-'create new application:': 'erzeuge neue Anwendung:',
+'Create': 'Erstellen',
+'create file with filename:': 'Erzeuge Datei mit Dateinamen:',
+'create new application:': 'Erzeuge neue Anwendung:',
 'Create new simple application': 'Erzeuge neue Anwendung',
-'created by': 'erstellt von',
+'Create/Upload': 'Create/Upload',
+'created by': 'Erstellt von',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
 'crontab': 'crontab',
 'Current request': 'Aktuelle Anfrage (request)',
 'Current response': 'Aktuelle Antwort (response)',
 'Current session': 'Aktuelle Sitzung (session)',
 'currently running': 'aktuell in Betrieb',
 'currently saved or': 'des derzeit gespeicherten oder',
-'customize me!': 'pass mich an!',
+'customize me!': 'Pass mich an!',
 'data uploaded': 'Daten hochgeladen',
 'Database': 'Datenbank',
 'database': 'Datenbank',
+'Database %s select': 'Database %s select',
 'database %s select': 'Datenbank %s ausgewählt',
+'Database administration': 'Database administration',
 'database administration': 'Datenbankadministration',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Datum und Uhrzeit',
 'db': 'db',
 'DB Model': 'DB Modell',
@@ -111,53 +171,90 @@
 'delete': 'löschen',
 'delete all checked': 'lösche alle markierten',
 'delete plugin': 'Plugin löschen',
-'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
-'Delete:': 'löschen:',
+'Delete this file (you will be asked to confirm deletion)': 'Diese Datei löschen (mit Bestätigungsdialog)',
+'Delete:': 'Löschen:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
 'Deploy': 'Installieren',
 'Deploy on Google App Engine': 'Auf Google App Engine installieren',
 'Deploy to OpenShift': 'Auf OpenShift installieren',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
 'Description': 'Beschreibung',
+'Description:': 'Description:',
 'design': 'design',
-'DESIGN': 'design',
+'DESIGN': 'DESIGN',
 'Design for': 'Design für',
-'Detailed traceback description': 'Detailed traceback description',
+'Detailed traceback description': 'Detaillierte traceback Beschreibung',
+'details': 'details',
 'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
 'Disable': 'Deaktivieren',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'docs',
+'Docs': 'Docs',
 'documentation': 'Dokumentation',
 'done!': 'fertig!',
+'Downgrade': 'Downgrade',
 'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
 'download layouts': 'Layouts herunterladen',
-'download plugins': 'download plugins',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'Plugins herunterladen',
+'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'E-mail',
 'EDIT': 'BEARBEITEN',
-'Edit': 'bearbeiten',
+'Edit': 'Bearbeiten',
+'edit all': 'edit all',
 'Edit application': 'Bearbeite Anwendung',
 'edit controller': 'Bearbeite Controller',
+'edit controller:': 'bearbeite Controller:',
 'Edit current record': 'Bearbeite aktuellen Datensatz',
 'Edit Profile': 'Bearbeite Profil',
 'edit profile': 'bearbeite Profil',
 'Edit This App': 'Bearbeite diese Anwendung',
 'edit views:': 'Views bearbeiten:',
+'Editing %s': 'Bearbeite %s',
 'Editing file': 'Bearbeite Datei',
 'Editing file "%s"': 'Bearbeite Datei "%s"',
 'Editing Language file': 'Sprachdatei bearbeiten',
-'Enable': 'Enable',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Aktivieren',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error': 'Fehler',
 'Error logs for "%(app)s"': 'Fehlerprotokoll für "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
-'Errors': 'Fehler',
+'Errors': 'Fehlermeldungen',
 'escape': 'escape',
-'Exception instance attributes': 'Atribute der Ausnahmeinstanz',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Attribute der Ausnahmeinstanz',
+'Exit Fullscreen': 'Vollbild beenden',
 'Expand Abbreviation': 'Kürzel erweitern',
+'Expand Abbreviation (html files only)': 'Abkürzungen ausschreiben (nur HTML Dateien)',
 'export as csv file': 'Exportieren als CSV-Datei',
+'Exports:': 'Exports:',
 'exposes': 'stellt zur Verfügung',
-'exposes:': 'exposes:',
+'exposes:': 'stellt folgendes zur Verfügung:',
 'extends': 'erweitert',
-'failed to compile file because:': 'failed to compile file because:',
+'failed to compile file because:': 'Datei konnte nicht kompiliert werden, da:',
 'failed to reload module': 'neu laden des Moduls fehlgeschlagen',
+'failed to reload module because:': 'failed to reload module because:',
 'File': 'Datei',
 'file "%(filename)s" created': 'Datei "%(filename)s" erstellt',
 'file "%(filename)s" deleted': 'Datei "%(filename)s" gelöscht',
@@ -166,253 +263,452 @@
 'file "%s" of %s restored': 'Datei "%s" von %s wiederhergestellt',
 'file changed on disk': 'Datei auf Festplatte geändert',
 'file does not exist': 'Datei existiert nicht',
+'file not found': 'file not found',
 'file saved on %(time)s': 'Datei gespeichert am %(time)s',
 'file saved on %s': 'Datei gespeichert auf %s',
-'filter': 'filter',
-'Find Next': 'Find Next',
-'Find Previous': 'Find Previous',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
+'filter': 'Filter',
+'Find Next': 'Nächster',
+'Find Previous': 'Vorheriger',
 'First name': 'Vorname',
+'Form has errors': 'Form has errors',
 'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'Funktionen ohne doctests erzeugen [passed] in Tests',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
 'Get from URL:': 'Get from URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
-'Go to Matching Pair': 'gehe zum übereinstimmenden Paar',
+'Globals##debug': 'Globals##debug',
+'Go to Matching Pair': 'Gehe zum übereinstimmenden Paar',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
 'graph model': 'graph model',
+'Graph Model': 'Graph Model',
 'Group ID': 'Gruppen ID',
 'Hello World': 'Hallo Welt',
 'Help': 'Hilfe',
-'Hide/Show Translated strings': 'Hide/Show Translated strings',
-'Home': 'Home',
+'here': 'here',
+'Hide/Show Translated strings': 'Zeige/Verstecke übersetzte Strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Startseite',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'htmledit',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Falls der obere Test eine Fehler-Ticketnummer enthält deutet das auf einen Fehler in der Ausführung des Controllers hin, noch bevor der Doctest ausgeführt werden konnte. Gewöhnlich Führen fehlerhafte Einrückungen oder fehlerhafter Code ausserhalb der Funktion zu solchen Fehlern. Ein grüner Titel deutet darauf hin, dass alle Test(wenn sie vorhanden sind) erfolgreich durchlaufen wurden. In diesem Fall werden die Testresultate nicht angezeigt.',
-'If you answer "yes", be patient, it may take a while to download': '',
-'If you answer yes, be patient, it may take a while to download': 'If you answer yes, be patient, it may take a while to download',
+'If you answer "yes", be patient, it may take a while to download': 'Wenn Sie mit "Ja" antworten, seien Sie bitte geduldig. Der Download könnte eine Weile dauern.',
+'If you answer yes, be patient, it may take a while to download': 'Wenn Sie mit Ja antworten, seien Sie bitte geduldig. Der Download könnte eine Weile dauern.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
 'Import/Export': 'Importieren/Exportieren',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'Einfügen',
+'Indent with tabs': 'Indent with tabs',
 'Index': 'Index',
 'index': 'index',
 'insert new': 'neu Einfügen',
 'insert new %s': 'neu Einfügen %s',
-'inspect attributes': 'inspect attributes',
-'Install': 'installieren',
+'inspect attributes': 'Attribute inspizieren',
+'Install': 'Installieren',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Installierte Anwendungen',
-'internal error': 'interner Fehler',
-'Internal State': 'interner Status',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
+'internal error': 'Interner Fehler',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'Interner Status',
 'Invalid action': 'Ungültige Aktion',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'Ungültige Email',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'Ungültiges Passwort',
+'invalid password.': 'invalid password.',
 'Invalid Query': 'Ungültige Abfrage',
 'invalid request': 'Ungültige Anfrage',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'Ungültiges Ticket',
+'Key': 'Key',
 'Key bindings': 'Tastenbelegungen',
 'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
 'Key bindings for ZenConding Plugin': 'Tastenbelegungen für das ZenConding Plugin',
+'Keyboard shortcuts': 'Tastenkombination',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'Sprachdatei "%(filename)s" erstellt/aktualisiert',
 'Language files (static strings) updated': 'Sprachdatei (statisch Strings) aktualisiert',
 'languages': 'Sprachen',
 'Languages': 'Sprachen',
 'languages updated': 'Sprachen aktualisiert',
 'Last name': 'Nachname',
+'Last Revision': 'Last Revision',
 'Last saved on:': 'Zuletzt gespeichert am:',
 'Layout': 'Layout',
 'License for': 'Lizenz für',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'nach Ticket aufgelistet',
+'Loading...': 'Loading...',
 'loading...': 'lade...',
+'Local Apps': 'Local Apps',
 'locals': 'locals',
-'located in the file': 'located in Datei',
-'Login': 'Anmelden',
+'Locals##debug': 'Locals##debug',
+'located in the file': 'befindet sich in der Datei',
 'login': 'anmelden',
+'Login': 'Anmelden',
+'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'An das Administrations-Interface anmelden',
-'Logout': 'abmelden',
+'Login/Register': 'Login/Register',
+'Logout': 'Abmelden',
+'lost password': 'lost password',
 'Lost Password': 'Passwort vergessen',
 'lost password?': 'Passwort vergessen?',
-'Main Menu': 'Menü principal',
+'Main Menu': 'Hauptmenü',
 'Manage': 'Verwalten',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
 'Match Pair': 'Paare finden',
+'Memberships': 'Memberships',
 'Menu Model': 'Menü Modell',
 'merge': 'verbinden',
 'Merge Lines': 'Zeilen zusammenfügen',
 'Models': 'Modelle',
 'models': 'Modelle',
+'Modified On': 'Modified On',
 'Modules': 'Module',
 'modules': 'Module',
+'Multi User Mode': 'Multi User Mode',
 'Name': 'Name',
 'new application "%s" created': 'neue Anwendung "%s" erzeugt',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'Neue Anwendung per Assistent',
-'new plugin installed': 'new plugin installed',
+'new plugin installed': 'Neues Plugin wurde installiert',
+'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Neuer Datensatz',
-'new record inserted': 'neuer Datensatz eingefügt',
+'new record inserted': 'Neuer wurde Datensatz eingefügt',
 'New simple application': 'Neue einfache Anwendung',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': 'nächsten 100 Zeilen',
 'Next Edit Point': 'nächster Bearbeitungsschritt',
 'NO': 'NEIN',
+'no changes': 'no changes',
 'No databases in this application': 'Keine Datenbank in dieser Anwendung',
-'no package selected': 'no package selected',
-'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
-'online designer': 'online designer',
-'or alternatively': 'or alternatively',
-'Or Get from URL:': 'oder hole es von folgender URL:',
+'No Interaction yet': 'No Interaction yet',
+'no match': 'no match',
+'no package selected': 'Kein Paket ausgewählt',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'No ticket_storage.txt found under /private folder': 'Kein ticket_storage.txt unter /private folder gefunden',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'online designer': 'Online Designer',
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'oder Alternativ',
+'Or Get from URL:': 'oder von folgender URL herunterladen:',
 'or import from csv file': 'oder importieren von cvs Datei',
 'or provide app url:': 'oder geben Sie eine Anwendungs-URL an:',
 'or provide application url:': 'oder geben Sie eine Anwendungs-URL an:',
 'Origin': 'Herkunft',
 'Original/Translation': 'Original/übersetzung',
-'Overwrite installed app': 'installierte Anwendungen überschreiben',
-'Pack all': 'verpacke alles',
+'Overview': 'Overview',
+'Overwrite installed app': 'Installierte Anwendungen überschreiben',
+'Pack all': 'Verpacke alles',
 'Pack compiled': 'Verpacke kompiliert',
 'Pack custom': 'Verpacke individuell',
 'pack plugin': 'Plugin verpacken',
 'Password': 'Passwort',
+'password changed': 'password changed',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
 'Peeking at file': 'Dateiansicht',
-'please wait!': 'bitte warten!',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'please wait!': 'Bitte warten!',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
+'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
 'Plugin "%s" in application': 'Plugin "%s" in Anwendung',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
 'plugins': 'plugins',
 'Plugins': 'Plugins',
+'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Unterstützt von',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': 'vorherige 100 zeilen',
 'Previous Edit Point': 'vorheriger Bearbeitungsschritt',
 'Private files': 'Private files',
 'private files': 'private files',
 'Project Progress': 'Projekt Fortschritt',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
 'Query:': 'Abfrage:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Schnelle Suche',
+'Record': 'Record',
 'record': 'Datensatz',
 'record does not exist': 'Datensatz existiert nicht',
 'record id': 'Datensatz id',
 'Record ID': 'Datensatz ID',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'Register': 'Registrieren',
 'register': 'Registrierung',
-'Register': 'registrieren',
 'Registration key': 'Registrierungsschlüssel',
 'reload': 'Neu laden',
 'Reload routes': 'Routen neu laden',
 'Remove compiled': 'Bytecode löschen',
-'Replace': 'Replace',
-'Replace All': 'Replace All',
-'request': 'request',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Ersetzen',
+'Replace All': 'Alle Ersetzen',
+'Repository (%s)': 'Repository (%s)',
+'request': 'Anfrage',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
 'Reset Password key': 'Passwortschlüssel zurücksetzen',
 'Resolve Conflict file': 'bereinige Konflikt-Datei',
 'response': 'Antwort',
+'restart': 'restart',
 'restore': 'wiederherstellen',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'zurückkehren',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
 'Role': 'Rolle',
+'Roles': 'Roles',
 'Rows in table': 'Zeilen in Tabelle',
+'Rows in Table': 'Rows in Table',
 'Rows selected': 'Zeilen ausgewählt',
-'rules are not defined': 'rules are not defined',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'rules are not defined': 'Regeln sind nicht definiert',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Tests in dieser Datei ausführen (um alle Dateien auszuführen, kann auch der Button 'test' genutzt werden)",
 'Running on %s': 'läuft auf %s',
-'Save': 'Save',
-'save': 'sichern',
-'Save file:': 'Save file:',
-'Save via Ajax': 'via Ajax sichern',
+'Save': 'Speichern',
+'save': 'Speichern',
+'Save file:': 'Speichere Datei:',
+'Save file: %s': 'Speichere Datei: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'via Ajax speichern',
 'Saved file hash:': 'Gespeicherter Datei-Hash:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
 'Select Files to Package': 'Dateien zum Paketieren wählen',
 'selected': 'ausgewählt(e)',
 'session': 'Sitzung',
 'session expired': 'Sitzung abgelaufen',
-'shell': 'shell',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
+'shell': 'Shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
 'Site': 'Seite',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': 'einige Dateien konnten nicht gelöscht werden',
-'Start searching': 'Start searching',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'Quelle : Dateisystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Suche beginnen',
 'Start wizard': 'Assistent starten',
 'state': 'Status',
-'Static': 'Static',
+'Static': 'Statisch',
 'static': 'statische Dateien',
 'Static files': 'statische Dateien',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
 'Stylesheet': 'Stylesheet',
-'Submit': 'Submit',
 'submit': 'Absenden',
+'Submit': 'Submit',
+'successful': 'successful',
 'Sure you want to delete this object?': 'Wollen Sie das Objekt wirklich löschen?',
+'switch to : db': 'wechsel zu : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'Tabelle',
+'Table': 'Table',
 'Table name': 'Tabellen Name',
+'Temporary': 'Temporary',
 'test': 'Test',
 'test_def': 'test_def',
 'test_for': 'test_for',
 'test_if': 'test_if',
 'test_try': 'test_try',
 'Testing application': 'Teste die Anwendung',
-'Testing controller': 'teste Controller',
+'Testing controller': 'Teste Controller',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'Die "query" ist eine Bedingung wie "db.table1.field1 == \'Wert\'". Etwas wie "db.table1.field1 db.table2.field2 ==" führt zu einem SQL JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'Die Logik der Anwendung, jeder URL-Pfad wird auf eine Funktion abgebildet die der Controller zur Verfügung stellt',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'the data representation, define database tables and sets': 'Die Datenrepräsentation definiert Mengen von Tabellen und Datenbanken ',
-'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
-'The output of the file is a dictionary that was rendered by the view': 'The output of the file is a dictionary that was rendered by the view',
-'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'the presentations layer, views are also known as templates': 'Die präsentationsschicht, Views sind auch bekannt als Vorlagen/Templates',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'Die Logik der Anwendung, jeder URL-Pfad wird auf eine Funktion abgebildet die der Controller zur Verfügung stellt',
+'the data representation, define database tables and sets': 'Die Datenrepräsentation definiert Mengen von Tabellen und Datenbanken',
+'The data representation, define database tables and sets': 'Die Datenrepräsentation definiert Mengen von Tabellen und Datenbanken',
+'The output of the file is a dictionary that was rendered by the view': 'Die Ausgabe der Datei ist ein "dictionary" und wurde vom "view" gerendert',
+'The presentations layer, views are also known as templates': 'Die Präsentationsschicht, Views sind auch bekannt als Vorlagen/Templates',
+'the presentations layer, views are also known as templates': 'Die Präsentationsschicht, Views sind auch bekannt als Vorlagen/Templates',
+'Theme': 'Theme',
 'There are no controllers': 'Keine Controller vorhanden',
 'There are no models': 'Keine Modelle vorhanden',
 'There are no modules': 'Keine Module vorhanden',
 'There are no plugins': 'Keine Plugins vorhanden',
-'There are no private files': 'There are no private files',
+'There are no private files': 'Keine privaten Dateien vorhanden',
 'There are no static files': 'Keine statischen Dateien vorhanden',
+'There are no translators': 'There are no translators',
 'There are no translators, only default language is supported': 'Keine übersetzungen vorhanden, nur die voreingestellte Sprache wird Unterstützt',
 'There are no views': 'Keine Views vorhanden',
-'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are not served, they are only available from within your app': 'Diese Dateien werden nicht ausgeliefert, sie sind nur innerhalb Ihrer App verfügbar',
 'These files are served without processing, your images go here': 'Diese Dateien werden ohne Verarbeitung ausgeliefert. Beispielsweise Bilder kommen hier hin.',
 'these files are served without processing, your images go here': 'Diese Dateien werden ohne Verarbeitung ausgeliefert. Beispielsweise Bilder kommen hier hin.',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
 'This is a copy of the scaffolding application': 'Dies ist eine Kopie einer Grundgerüst-Anwendung',
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'Dies ist das Template %(filename)s',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
 'Ticket': 'Ticket',
 'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': 'Zeitstempel',
 'TM': 'TM',
 'to  previous version.': 'zu einer früheren Version.',
 'To create a plugin, name a file/folder plugin_[name]': 'Um ein Plugin zu erstellen benennen Sie eine(n) Datei/Ordner plugin_[Name]',
-'toggle breakpoint': 'toggle breakpoint',
-'Toggle Fullscreen': 'Toggle Fullscreen',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'Breakpoint aktivieren/deaktivieren',
+'Toggle comment': ' Kommentar ein-/ausblenden',
+'Toggle Fullscreen': 'Vollbild ein-/ausschalten',
 'Traceback': 'Traceback',
 'translation strings for the application': 'übersetzungs-Strings für die Anwendung',
 'Translation strings for the application': 'übersetzungs-Strings für die Anwendung',
 'try': 'versuche',
-'try something like': 'versuche so etwas wie',
-'Try the mobile interface': 'Try the mobile interface',
-'try view': 'try view',
-'Unable to check for upgrades': 'überprüfen von Upgrades nicht möglich',
-'unable to create application "%s"': 'erzeugen von Anwendung "%s" nicht möglich',
-'unable to delete file "%(filename)s"': 'löschen von Datein "%(filename)s" nicht möglich',
-'Unable to download': 'herunterladen nicht möglich',
-'Unable to download app': 'herunterladen der Anwendung nicht möglich',
-'unable to parse csv file': 'analysieren der cvs Datei nicht möglich',
-'unable to uninstall "%s"': 'deinstallieren von "%s" nicht möglich',
-'uncheck all': 'Selektionen entfernen',
-'Uninstall': 'deinstallieren',
-'update': 'aktualisieren',
-'update all languages': 'aktualisiere alle Sprachen',
+'try something like': 'Versuchen Sie so etwas wie',
+'Try the mobile interface': 'Testen Sie das Interface für Handys',
+'try view': 'Versuche view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Überprüfen von Upgrades nicht möglich',
+'unable to create application "%s"': 'Erzeugen von Anwendung "%s" nicht möglich',
+'unable to delete file "%(filename)s"': 'Löschen von Dateien "%(filename)s" nicht möglich',
+'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download': 'Herunterladen nicht möglich',
+'Unable to download app': 'Herunterladen der Anwendung nicht möglich',
+'Unable to download app because:': 'Unable to download app because:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
+'unable to parse csv file': 'Analysieren der cvs Datei nicht möglich',
+'unable to uninstall "%s"': 'Deinstallieren von "%s" nicht möglich',
+'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
+'uncheck all': 'Auswahl entfernen',
+'Uninstall': 'Deinstallieren',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
+'update': 'Aktualisieren',
+'update all languages': 'Aktualisiere alle Sprachen',
 'Update:': 'Aktualisiere:',
-'upgrade web2py now': 'jetzt web2py upgraden',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
+'upgrade web2py now': 'web2py jetzt upgraden',
 'upload': 'upload',
 'Upload': 'Upload',
 'Upload & install packed application': 'Verpackte Anwendung hochladen und installieren',
 'Upload a package:': 'Ein Packet hochladen:',
 'Upload and install packed application': 'Verpackte Anwendung hochladen und installieren',
-'upload application:': 'lade Anwendung hoch:',
-'Upload existing application': 'lade existierende Anwendung hoch',
-'upload file:': 'lade Datei hoch:',
+'upload application:': 'Lade Anwendung hoch:',
+'Upload existing application': 'Lade existierende Anwendung hoch',
+'upload file:': 'Lade Datei hoch:',
 'upload plugin file:': 'Plugin-Datei hochladen:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Benutze (...)&(...) für AND, (...)|(...) für OR, und ~(...) für NOT, um komplexe Abfragen zu erstellen.',
 'Use an url:': 'Verwende URL:',
 'user': 'Nutzer',
+'User': 'User',
 'User ID': 'Benutzer ID',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'Variablen',
 'Version': 'Version',
 'Version %s.%s.%s (%s) %s': 'Version %s.%s.%s (%s) %s',
-'versioning': 'Versionierung',
-'Versioning': 'Versionierung',
+'Versioning': 'Versionsverwaltung',
+'versioning': 'Versionsverwaltung',
 'View': 'Ansicht',
 'view': 'Ansicht',
 'Views': 'Ansichten',
 'views': 'Ansichten',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
 'Web Framework': 'Web Framework',
-'web2py is up to date': 'web2py ist auf dem neuesten Stand',
-'web2py Recent Tweets': 'neuste Tweets von web2py',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
+'web2py is up to date': 'web2py ist aktuell',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'Neuste Tweets von web2py',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
 'Welcome %s': 'Willkommen %s',
 'Welcome to web2py': 'Willkommen zu web2py',
 'Which called the function': 'welche die Funktion aufrief',
+'Working...': 'Working...',
 'Wrap with Abbreviation': 'mit Kürzel einhüllen',
+'WSGI reference name': 'WSGI reference name',
 'xml': 'xml',
 'YES': 'JA',
+'Yes': 'Yes',
 'You are successfully running web2py': 'web2by wird erfolgreich ausgeführt',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
 'You can modify this application and adapt it to your needs': 'Sie können diese Anwendung verändern und Ihren Bedürfnissen anpassen',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
 'You visited the url': 'Sie besuchten die URL',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/default.py

@@ -1,184 +0,0 @@
-# coding: utf8
-{
-'!langcode!': 'en-us',
-'!langname!': 'English (US)',
-'%Y-%m-%d': '%m-%d-%Y',
-'%Y-%m-%d %H:%M:%S': '%m-%d-%Y %H:%M:%S',
-'(requires internet access)': '(requires internet access)',
-'(something like "it-it")': '(something like "it-it")',
-'About': 'About',
-'Additional code for your application': 'Additional code for your application',
-'admin disabled because unable to access password file': 'admin disabled because unable to access password file',
-'Admin language': 'Admin language',
-'administrative interface': 'administrative interface',
-'Administrator Password:': 'Administrator Password:',
-'and rename it:': 'and rename it:',
-'Application name:': 'Application name:',
-'are not used yet': 'are not used yet',
-'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
-'arguments': 'arguments',
-'at char %s': 'at char %s',
-'at line %s': 'at line %s',
-'back': '<<back',
-'Basics': 'Basics',
-'Begin': 'Begin',
-'can be a git repo': 'can be a git repo',
-'Change admin password': 'Change admin password',
-'Check for upgrades': 'Check for upgrades',
-'Checking for upgrades...': 'Checking for upgrades...',
-'Clean': 'Clean',
-'code': 'code',
-'collapse/expand all': 'collapse/expand all',
-'Compile': 'Compile',
-'Controllers': 'Controllers',
-'controllers': 'controllers',
-'Create': 'Create',
-'create file with filename:': 'create file with filename:',
-'Create rules': 'Create rules',
-'created by': 'created by',
-'crontab': 'crontab',
-'currently running': 'currently running',
-'currently saved or': 'currently saved or',
-'database administration': 'database administration',
-'Debug': 'Debug',
-'defines tables': 'defines tables',
-'delete': 'delete',
-'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
-'Deploy': 'Deploy',
-'Deploy on Google App Engine': 'Deploy on Google App Engine',
-'Deploy to OpenShift': 'Deploy to OpenShift',
-'Detailed traceback description': 'Detailed traceback description',
-'direction: ltr': 'direction: ltr',
-'Disable': 'Disable',
-'docs': 'docs',
-'download layouts': 'download layouts',
-'download plugins': 'download plugins',
-'Edit': 'Edit',
-'edit all': 'edit all',
-'Edit application': 'Edit application',
-'edit controller': 'edit controller',
-'edit views:': 'edit views:',
-'Editing file "%s"': 'Editing file "%s"',
-'Editing Language file': 'Editing Language file',
-'Error snapshot': 'Error snapshot',
-'Error ticket': 'Error ticket',
-'Errors': 'Errors',
-'Exception instance attributes': 'Exception instance attributes',
-'Expand Abbreviation': 'Expand Abbreviation',
-'exposes': 'exposes',
-'exposes:': 'exposes:',
-'extends': 'extends',
-'failed to compile file because:': 'failed to compile file because:',
-'file does not exist': 'file does not exist',
-'file saved on %s': 'file saved on %s',
-'filter': 'filter',
-'Frames': 'Frames',
-'Generate': 'Generate',
-'Get from URL:': 'Get from URL:',
-'Git Pull': 'Git Pull',
-'Git Push': 'Git Push',
-'Go to Matching Pair': 'Go to Matching Pair',
-'go!': 'go!',
-'Help': 'Help',
-'Hide/Show Translated strings': 'Hide/Show Translated strings',
-'includes': 'includes',
-'inspect attributes': 'inspect attributes',
-'Install': 'Install',
-'Installed applications': 'Installed applications',
-'invalid password.': 'invalid password.',
-'Key bindings': 'Key bindings',
-'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
-'Language files (static strings) updated': 'Language files (static strings) updated',
-'languages': 'languages',
-'Languages': 'Languages',
-'Last saved on:': 'Last saved on:',
-'loading...': 'loading...',
-'locals': 'locals',
-'Login': 'Login',
-'Login to the Administrative Interface': 'Login to the Administrative Interface',
-'Logout': 'Logout',
-'Match Pair': 'Match Pair',
-'Merge Lines': 'Merge Lines',
-'models': 'models',
-'Models': 'Models',
-'Modules': 'Modules',
-'modules': 'modules',
-'New Application Wizard': 'New Application Wizard',
-'New application wizard': 'New application wizard',
-'New simple application': 'New simple application',
-'Next Edit Point': 'Next Edit Point',
-'online designer': 'online designer',
-'Original/Translation': 'Original/Translation',
-'Overwrite installed app': 'Overwrite installed app',
-'Pack all': 'Pack all',
-'Peeking at file': 'Peeking at file',
-'Plugins': 'Plugins',
-'plugins': 'plugins',
-'Plural-Forms:': 'Plural-Forms:',
-'Powered by': 'Powered by',
-'Previous Edit Point': 'Previous Edit Point',
-'Private files': 'Private files',
-'private files': 'private files',
-'Reload routes': 'Reload routes',
-'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
-'request': 'request',
-'response': 'response',
-'restart': 'restart',
-'restore': 'restore',
-'revert': 'revert',
-'rules are not defined': 'rules are not defined',
-'rules:': 'rules:',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
-'Running on %s': 'Running on %s',
-'Save': 'Save',
-'Save via Ajax': 'Save via Ajax',
-'Saved file hash:': 'Saved file hash:',
-'session': 'session',
-'session expired': 'session expired',
-'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
-'shell': 'shell',
-'Site': 'Site',
-'skip to generate': 'skip to generate',
-'Start a new app': 'Start a new app',
-'Start wizard': 'Start wizard',
-'static': 'static',
-'Static files': 'Static files',
-'Step': 'Step',
-'Submit': 'Submit',
-'successful': 'successful',
-'test': 'test',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
-'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'There are no models': 'There are no models',
-'There are no plugins': 'There are no plugins',
-'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
-'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'Ticket ID': 'Ticket ID',
-'Ticket Missing': 'Ticket Missing',
-'to  previous version.': 'to  previous version.',
-'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
-'toggle breakpoint': 'toggle breakpoint',
-'Toggle Fullscreen': 'Toggle Fullscreen',
-'Traceback': 'Traceback',
-'Translation strings for the application': 'Translation strings for the application',
-'try view': 'try view',
-'Uninstall': 'Uninstall',
-'update': 'update',
-'update all languages': 'update all languages',
-'upload': 'upload',
-'Upload a package:': 'Upload a package:',
-'Upload and install packed application': 'Upload and install packed application',
-'upload file:': 'upload file:',
-'upload plugin file:': 'upload plugin file:',
-'variables': 'variables',
-'Version': 'Version',
-'Version %s.%s.%s (%s) %s': 'Version %s.%s.%s (%s) %s',
-'Versioning': 'Versioning',
-'views': 'views',
-'Views': 'Views',
-'Web Framework': 'Web Framework',
-'web2py is up to date': 'web2py is up to date',
-'web2py Recent Tweets': 'web2py Recent Tweets',
-'Wrap with Abbreviation': 'Wrap with Abbreviation',
-}

applications/admin/languages/en.py

@@ -0,0 +1,574 @@
+# -*- coding: utf-8 -*-
+{
+'!langcode!': 'en-us',
+'!langname!': 'English (US)',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
+'%s %%{row} deleted': '%s %%{row} deleted',
+'%s %%{row} updated': '%s %%{row} updated',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
+'(something like "it-it")': '(something like "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
+'Abort': 'Abort',
+'About': 'About',
+'About application': 'About application',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
+'Additional code for your application': 'Additional code for your application',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': 'admin disabled because no admin password',
+'admin disabled because not supported on google app engine': 'admin disabled because not supported on google app engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': 'admin disabled because unable to access password file',
+'Admin is disabled because insecure channel': 'Admin is disabled because insecure channel',
+'Admin language': 'Admin language',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'administrative interface',
+'Administrator Password:': 'Administrator Password:',
+'and rename it:': 'and rename it:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'appadmin is disabled because insecure channel',
+'Application': 'Application',
+'application "%s" uninstalled': 'application "%s" uninstalled',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'application compiled',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
+'Application name:': 'Application name:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
+'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
+'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Are you sure you want to uninstall application "%s"?': 'Are you sure you want to uninstall application "%s"?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'ATTENTION: you cannot edit the running application!': 'ATTENTION: you cannot edit the running application!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'back',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'cache, errors and sessions cleaned',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
+'Cannot be empty': 'Cannot be empty',
+'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
+'cannot create file': 'cannot create file',
+'cannot upload file "%(filename)s"': 'cannot upload file "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
+'Change admin password': 'Change admin password',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
+'check all': 'check all',
+'Check for upgrades': 'Check for upgrades',
+'Check to delete': 'Check to delete',
+'Checking for upgrades...': 'Checking for upgrades...',
+'Clean': 'Clean',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'collapse/expand all',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
+'Compile': 'Compile',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'compiled application removed',
+'Condition': 'Condition',
+'continue': 'continue',
+'Controllers': 'Controllers',
+'controllers': 'controllers',
+'Count': 'Count',
+'Create': 'Create',
+'create file with filename:': 'create file with filename:',
+'Create/Upload': 'Create/Upload',
+'created by': 'created by',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': 'crontab',
+'Current request': 'Current request',
+'Current response': 'Current response',
+'Current session': 'Current session',
+'currently running': 'currently running',
+'currently saved or': 'currently saved or',
+'data uploaded': 'data uploaded',
+'Database': 'Database',
+'Database %s select': 'Database %s select',
+'Database administration': 'Database administration',
+'database administration': 'database administration',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Date and Time': 'Date and Time',
+'db': 'db',
+'Debug': 'Debug',
+'defines tables': 'defines tables',
+'Delete': 'Delete',
+'delete': 'delete',
+'delete all checked': 'delete all checked',
+'delete plugin': 'delete plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'Delete:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
+'Deploy': 'Deploy',
+'Deploy on Google App Engine': 'Deploy on Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
+'design': 'design',
+'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
+'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
+'Disable': 'Disable',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
+'done!': 'done!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
+'download layouts': 'download layouts',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'download plugins',
+'Download plugins from repository': 'Download plugins from repository',
+'Edit': 'Edit',
+'edit all': 'edit all',
+'Edit application': 'Edit application',
+'edit controller:': 'edit controller:',
+'Edit current record': 'Edit current record',
+'edit views:': 'edit views:',
+'Editing %s': 'Editing %s',
+'Editing Language file': 'Editing Language file',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
+'Error': 'Error',
+'Error logs for "%(app)s"': 'Error logs for "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'Errors',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Exception instance attributes',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
+'export as csv file': 'export as csv file',
+'Exports:': 'Exports:',
+'exposes': 'exposes',
+'exposes:': 'exposes:',
+'extends': 'extends',
+'failed to compile file because:': 'failed to compile file because:',
+'failed to reload module because:': 'failed to reload module because:',
+'File': 'File',
+'file "%(filename)s" created': 'file "%(filename)s" created',
+'file "%(filename)s" deleted': 'file "%(filename)s" deleted',
+'file "%(filename)s" uploaded': 'file "%(filename)s" uploaded',
+'file "%s" of %s restored': 'file "%s" of %s restored',
+'file changed on disk': 'file changed on disk',
+'file does not exist': 'file does not exist',
+'file not found': 'file not found',
+'file saved on %(time)s': 'file saved on %(time)s',
+'file saved on %s': 'file saved on %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
+'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'Form has errors': 'Form has errors',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'Graph Model': 'Graph Model',
+'graph model': 'graph model',
+'Help': 'Help',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'Import/Export',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
+'includes': 'includes',
+'Indent with tabs': 'Indent with tabs',
+'inspect attributes': 'inspect attributes',
+'Install': 'Install',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': 'Installed applications',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
+'internal error': 'internal error',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'Internal State',
+'Invalid action': 'Invalid action',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid git repository specified.': 'Invalid git repository specified.',
+'invalid password': 'invalid password',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Invalid Query',
+'invalid request': 'invalid request',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
+'invalid ticket': 'invalid ticket',
+'Key': 'Key',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
+'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
+'Language files (static strings) updated': 'Language files (static strings) updated',
+'languages': 'languages',
+'Languages': 'Languages',
+'Last Revision': 'Last Revision',
+'Last saved on:': 'Last saved on:',
+'License for': 'License for',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
+'Local Apps': 'Local Apps',
+'locals': 'locals',
+'Locals##debug': 'Locals##debug',
+'Login': 'Login',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'Login to the Administrative Interface',
+'Login/Register': 'Login/Register',
+'Logout': 'Logout',
+'lost password': 'lost password',
+'Main Menu': 'Main Menu',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
+'merge': 'merge',
+'Models': 'Models',
+'models': 'models',
+'Modified On': 'Modified On',
+'Modules': 'Modules',
+'modules': 'modules',
+'Multi User Mode': 'Multi User Mode',
+'new application "%s" created': 'new application "%s" created',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
+'New application wizard': 'New application wizard',
+'new plugin installed': 'new plugin installed',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'New Record',
+'new record inserted': 'new record inserted',
+'New simple application': 'New simple application',
+'next': 'next',
+'next %s rows': 'next %s rows',
+'NO': 'NO',
+'no changes': 'no changes',
+'No databases in this application': 'No databases in this application',
+'No Interaction yet': 'No Interaction yet',
+'no match': 'no match',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
+'or import from csv file': 'or import from csv file',
+'Original/Translation': 'Original/Translation',
+'Overview': 'Overview',
+'Overwrite installed app': 'Overwrite installed app',
+'Pack all': 'Pack all',
+'Pack compiled': 'Pack compiled',
+'Pack custom': 'Pack custom',
+'pack plugin': 'pack plugin',
+'password changed': 'password changed',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Peeking at file',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
+'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
+'Plugin "%s" in application': 'Plugin "%s" in application',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
+'plugins': 'plugins',
+'Plugins': 'Plugins',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Powered by',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Query:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
+'record does not exist': 'record does not exist',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Reload routes': 'Reload routes',
+'Remove compiled': 'Remove compiled',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
+'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Resolve Conflict file',
+'response': 'response',
+'restart': 'restart',
+'restore': 'restore',
+'return': 'return',
+'Revert': 'Revert',
+'revert': 'revert',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in Table': 'Rows in Table',
+'Rows selected': 'Rows selected',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Running on %s',
+'Save': 'Save',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Saved file hash:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
+'session': 'session',
+'session expired': 'session expired',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
+'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': 'Site',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
+'some files could not be removed': 'some files could not be removed',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Start searching',
+'Start wizard': 'Start wizard',
+'state': 'state',
+'static': 'static',
+'Static': 'Static',
+'Static files': 'Static files',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
+'Submit': 'Submit',
+'submit': 'submit',
+'successful': 'successful',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
+'Table': 'Table',
+'Temporary': 'Temporary',
+'test': 'test',
+'Testing application': 'Testing application',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
+'Theme': 'Theme',
+'There are no controllers': 'There are no controllers',
+'There are no models': 'There are no models',
+'There are no modules': 'There are no modules',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': 'There are no static files',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'There are no views',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Ticket',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'to  previous version.': 'to  previous version.',
+'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
+'Translation strings for the application': 'Translation strings for the application',
+'try something like': 'try something like',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Unable to check for upgrades',
+'unable to create application "%s"': 'unable to create application "%s"',
+'unable to delete file "%(filename)s"': 'unable to delete file "%(filename)s"',
+'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download app because:': 'Unable to download app because:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
+'unable to parse csv file': 'unable to parse csv file',
+'unable to uninstall "%s"': 'unable to uninstall "%s"',
+'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
+'uncheck all': 'uncheck all',
+'Uninstall': 'Uninstall',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
+'update': 'update',
+'update all languages': 'update all languages',
+'Update:': 'Update:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
+'upload': 'upload',
+'Upload': 'Upload',
+'Upload a package:': 'Upload a package:',
+'Upload and install packed application': 'Upload and install packed application',
+'upload file:': 'upload file:',
+'upload plugin file:': 'upload plugin file:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
+'User': 'User',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
+'variables': 'variables',
+'Version': 'Version',
+'Versioning': 'Versioning',
+'Views': 'Views',
+'views': 'views',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
+'web2py is up to date': 'web2py is up to date',
+'web2py online debugger': 'web2py online debugger',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'YES',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+}

applications/admin/languages/es.py

@@ -3,29 +3,40 @@
 '!langcode!': 'es',
 '!langname!': 'Español',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"actualice" es una expresión opcional como "campo1=\'nuevo_valor\'". No se puede actualizar o eliminar resultados de un JOIN',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s filas eliminadas',
 '%s %%{row} updated': '%s filas actualizadas',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '(requires internet access, experimental)': '(requiere acceso a internet, experimental)',
 '(something like "it-it")': '(algo como "it-it")',
 '(version %s)': '(version %s)',
-'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
-'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
-'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
-'@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'?': '?',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(archivo **gluon/contrib/plural_rules/%s.py** no se ha encontrado)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'Ocurrió un error, por favor [[recargue %s]] la página',
+'@markmin\x01Number of entries: **%s**': 'Número de entradas: **%s**',
+'@markmin\x01Searching: **%s** %%{file}': 'Buscando: **%s** archivos',
 'A new version of web2py is available': 'Hay una nueva versión de web2py disponible',
 'A new version of web2py is available: %s': 'Hay una nueva versión de web2py disponible: %s',
-'About': 'acerca de',
+'Abort': 'Abort',
+'About': 'Acerca de',
 'About application': 'Acerca de la aplicación',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
 'additional code for your application': 'código adicional para su aplicación',
 'Additional code for your application': 'Código adicional para su aplicación',
+'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'admin deshabilitado por falta de contraseña',
 'admin disabled because not supported on google app engine': 'admin deshabilitado, no es soportado en GAE',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'admin deshabilitado, imposible acceder al archivo con la contraseña',
 'Admin is disabled because insecure channel': 'Admin deshabilitado, el canal no es seguro',
 'Admin is disabled because unsecure channel': 'Admin deshabilitado, el canal no es seguro',
 'Admin language': 'Lenguaje de administración',
+'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'interfaz administrativa',
 'Administrator Password:': 'Contraseña del Administrador:',
 'An error occured, please %s the page': 'Ha ocurrido un error, por favor %s la página',
@@ -34,264 +45,387 @@
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'admin deshabilitado, el canal no es seguro',
+'Application': 'Application',
 'application "%s" uninstalled': 'aplicación "%s" desinstalada',
 'application %(appname)s installed with md5sum: %(digest)s': 'application %(appname)s installed with md5sum: %(digest)s',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
 'application compiled': 'aplicación compilada',
 'Application exists already': 'Application exists already',
 'application is compiled and cannot be designed': 'la aplicación está compilada y no puede ser modificada',
 'Application name:': 'Nombre de la aplicación:',
+'Application updated via git pull': 'Application updated via git pull',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': '¿Está seguro que desea eliminar el archivo "%s"?',
 'Are you sure you want to delete plugin "%s"?': '¿Está seguro que quiere eliminar el plugin "%s"?',
-'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Are you sure you want to delete this object?': '¿Está seguro que quiere eliminar este objeto?',
 'Are you sure you want to uninstall application "%s"': '¿Está seguro que desea desinstalar la aplicación "%s"',
 'Are you sure you want to uninstall application "%s"?': '¿Está seguro que desea desinstalar la aplicación "%s"?',
 'Are you sure you want to upgrade web2py now?': '¿Está seguro que desea actualizar web2py ahora?',
-'Are you sure?': 'Are you sure?',
+'Are you sure?': '¿Está seguro?',
 'arguments': 'argumentos',
-'at char %s': 'en el caracter %s',
+'at char %s': 'en el carácter %s',
 'at line %s': 'en la línea %s',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENCION: Inicio de sesión requiere una conexión segura (HTTPS) o localhost.',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENCION: NO EJECUTE VARIAS PRUEBAS SIMULTANEAMENTE, NO SON THREAD SAFE.',
-'ATTENTION: you cannot edit the running application!': 'ATENCION: no puede modificar la aplicación que se ejecuta!',
-'Autocomplete': 'Autocomplete',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENCIÓN: Inicio de sesión requiere una conexión segura (HTTPS) o localhost.',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENCIÓN: NO EJECUTE VARIAS PRUEBAS SIMULTANEAMENTE, NO SON THREAD SAFE.',
+'ATTENTION: you cannot edit the running application!': 'ATENCIÓN: ¡no puede modificar la aplicación que se ejecuta!',
+'Autocomplete': 'Autocompletar',
 'Autocomplete Python Code': 'Autocompletar código Python',
 'Available databases and tables': 'Bases de datos y tablas disponibles',
-'Available Databases and Tables': 'Available Databases and Tables',
+'Available Databases and Tables': 'Bases de Datos y Tablas Disponibles',
 'back': 'atrás',
-'Back to the plugins list': 'Back to the plugins list',
-'breakpoint': 'breakpoint',
-'breakpoints': 'breakpoints',
-'browse': 'buscar',
-'Cache': 'Cache',
-'cache': 'cache',
-'cache, errors and sessions cleaned': 'cache, errores y sesiones eliminados',
+'Back to the plugins list': 'Regresar a la lista de plugins',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'punto de ruptura',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'puntos de ruptura',
+'browse': 'navegar',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Caché',
+'cache': 'caché',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'caché, errores y sesiones eliminados',
 'can be a git repo': 'puede ser un repositorio git',
-'Cancel': 'Cancel',
+'Cancel': 'Cancelar',
 'Cannot be empty': 'No puede estar vacío',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'No se puede compilar: hay errores en su aplicación. Depure, corrija errores y vuelva a intentarlo.',
 'Cannot compile: there are errors in your app:': 'No se puede compilar: hay errores en su aplicación:',
 'cannot create file': 'no es posible crear archivo',
 'cannot upload file "%(filename)s"': 'no es posible subir archivo "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'cambie contraseña admin',
 'change editor settings': 'cambiar la configuración del editor',
 'Change Password': 'Cambie Contraseña',
+'Changelog': 'Changelog',
 'check all': 'marcar todos',
 'Check for upgrades': 'buscar actualizaciones',
 'Check to delete': 'Marque para eliminar',
-'Checking for upgrades...': 'Buscando actulizaciones...',
-'Clean': 'limpiar',
-'Clear CACHE?': 'Clear CACHE?',
-'Clear DISK': 'Clear DISK',
-'Clear RAM': 'Clear RAM',
-'click here for online examples': 'haga clic aquí para ver ejemplos en línea',
-'click here for the administrative interface': 'haga clic aquí para usar la interfaz administrativa',
-'Click row to expand traceback': 'Click row to expand traceback',
+'Checking for upgrades...': 'Buscando actualizaciones...',
+'Clean': 'Limpiar',
+'Clear': 'Clear',
+'Clear CACHE?': '¿Limpiar CACHÉ?',
+'Clear DISK': 'Limpiar DISCO',
+'Clear RAM': 'Limpiar RAM',
+'click here for online examples': 'haga click aquí para ver ejemplos en línea',
+'click here for the administrative interface': 'haga click aquí para usar la interfaz administrativa',
+'Click row to expand traceback': 'Click en la fila para expandir el rastreo',
+'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'haga clic para buscar actualizaciones',
 'click to open': 'click para abrir',
 'Client IP': 'IP del Cliente',
 'code': 'código',
 'Code listing': 'Listado de código',
 'collapse/expand all': 'contraer/expandir todo',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
 'commit (mercurial)': 'confirmar (mercurial)',
-'Compile': 'compilar',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
+'Compile': 'Compilar',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'aplicación compilada removida',
+'Condition': 'Condition',
 'continue': 'continuar',
 'Controllers': 'Controladores',
 'controllers': 'controladores',
-'Count': 'Count',
+'Count': 'Contar',
 'Create': 'Crear',
 'create file with filename:': 'cree archivo con nombre:',
 'Create new application using the Wizard': 'Crear nueva aplicación utilizando el asistente',
 'create new application:': 'nombre de la nueva aplicación:',
 'Create new simple application': 'Cree una nueva aplicación',
-'Create/Upload': 'Create/Upload',
+'Create/Upload': 'Crear/Subir',
 'created by': 'creado por',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
 'crontab': 'crontab',
 'Current request': 'Solicitud en curso',
 'Current response': 'Respuesta en curso',
 'Current session': 'Sesión en curso',
-'currently running': 'currently running',
+'currently running': 'actualmente en ejecución',
 'currently saved or': 'actualmente guardado o',
-'customize me!': 'Adaptame!',
+'customize me!': 'Adáptame!',
 'data uploaded': 'datos subidos',
+'Database': 'Database',
 'database': 'base de datos',
+'Database %s select': 'Database %s select',
 'database %s select': 'selección en base de datos %s',
+'Database administration': 'Database administration',
 'database administration': 'administración base de datos',
-'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Database Administration (appadmin)': 'Administración de Base de Datos (appadmin)',
 'Date and Time': 'Fecha y Hora',
 'db': 'db',
-'Debug': 'Debug',
-'defines tables': 'define tablas',
-'Delete': 'Elimine',
+'Debug': 'Depurar',
+'defines tables': 'definir tablas',
+'Delete': 'Eliminar',
 'delete': 'eliminar',
 'delete all checked': 'eliminar marcados',
 'delete plugin': 'eliminar plugin',
 'Delete this file (you will be asked to confirm deletion)': 'Elimine este fichero (se le pedirá confirmación)',
-'Delete:': 'Elimine:',
+'Delete:': 'Eliminar:',
+'deleted after first hit': 'deleted after first hit',
 'Demo': 'Demo',
 'Deploy': 'Deploy',
 'Deploy on Google App Engine': 'Instale en Google App Engine',
 'Deploy to OpenShift': 'Instale en OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
 'Description': 'Descripción',
+'Description:': 'Description:',
 'design': 'modificar',
 'DESIGN': 'DISEÑO',
 'Design for': 'Diseño para',
-'Detailed traceback description': 'Detailed traceback description',
+'Detailed traceback description': 'Descripción detallada del rastreo',
 'details': 'detalles',
-'direction: ltr': 'direction: ltr',
+'direction: ltr': 'dirección: ltr',
+'directory not found': 'directory not found',
 'Disable': 'Deshabilitar',
-'DISK': 'DISK',
-'docs': 'docs',
-'Docs': 'Docs',
-'Done!': 'Done!',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISCO',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'documentos',
+'Docs': 'Documentos',
+'Done!': 'Listo!',
 'done!': 'listo!',
+'Downgrade': 'Downgrade',
 'Download': 'Descargar',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
 'download files via http:': 'descargar archivos via http:',
 'download layouts': 'descargar layouts',
+'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'descargar plugins',
+'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'Correo electrónico',
 'EDIT': 'EDITAR',
 'Edit': 'editar',
+'edit all': 'edit all',
 'Edit application': 'Editar aplicación',
 'edit controller': 'editar controlador',
-'edit controller:': 'edit controller:',
+'edit controller:': 'editar controlador:',
 'Edit current record': 'Edite el registro actual',
 'Edit Profile': 'Editar Perfil',
 'edit views:': 'editar vistas:',
-'Editing %s': 'Editing %s',
+'Editing %s': 'Editando %s',
 'Editing file': 'Editando archivo',
 'Editing file "%s"': 'Editando archivo "%s"',
 'Editing Language file': 'Editando archivo de lenguaje',
-'Editing myclientapi': 'Editing myclientapi',
-'Editing myemail': 'Editing myemail',
-'Editing rbare': 'Editing rbare',
-'Editing ul': 'Editing ul',
-'Enable': 'Enable',
-'Enterprise Web Framework': 'Armazón Empresarial para Internet',
+'Editing myclientapi': 'Editando myclientapi',
+'Editing myemail': 'Editando myemail',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editing rbare': 'Editando rbare',
+'Editing ul': 'Editando ul',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Habilitar',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
+'Enterprise Web Framework': 'Framework Web Empresarial',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Bitácora de errores en "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'errores',
-'Errors in form, please check it out.': 'Errors in form, please check it out.',
+'Errors in form, please check it out.': 'Errores en el formulario, verifique por favor.',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Atributos de la instancia de Excepción',
-'Exit Fullscreen': 'Exit Fullscreen',
-'Expand Abbreviation': 'Expand Abbreviation',
+'Exit Fullscreen': 'Salir de pantalla completa',
+'Expand Abbreviation': 'Expandir abreviación',
+'Expand Abbreviation (html files only)': 'Expandir Abreviación (sólo archivos html)',
 'export as csv file': 'exportar como archivo CSV',
+'Exports:': 'Exports:',
 'exposes': 'expone',
 'exposes:': 'expone:',
 'extends': 'extiende',
-'failed to compile file because:': 'failed to compile file because:',
+'failed to compile file because:': 'falló la compilación de archivos debido a:',
 'failed to reload module': 'recarga del módulo ha fallado',
 'failed to reload module because:': 'no es posible recargar el módulo por:',
-'File': 'File',
+'File': 'Archivo',
 'file "%(filename)s" created': 'archivo "%(filename)s" creado',
 'file "%(filename)s" deleted': 'archivo "%(filename)s" eliminado',
 'file "%(filename)s" uploaded': 'archivo "%(filename)s" subido',
-'file "%(filename)s" was not deleted': 'archivo "%(filename)s" no fué eliminado',
+'file "%(filename)s" was not deleted': 'archivo "%(filename)s" no fue eliminado',
 'file "%s" of %s restored': 'archivo "%s" de %s restaurado',
 'file changed on disk': 'archivo modificado en el disco',
 'file does not exist': 'archivo no existe',
+'file not found': 'file not found',
 'file saved on %(time)s': 'archivo guardado %(time)s',
 'file saved on %s': 'archivo guardado %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
 'filter': 'filter',
 'Find Next': 'Buscar próximo',
 'Find Previous': 'Bucar anterior',
 'First name': 'Nombre',
+'Form has errors': 'Form has errors',
 'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals',
-'graph model': 'graph model',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graficación del modelo',
+'Graph Model': 'Graph Model',
 'Group ID': 'ID de Grupo',
 'Hello World': 'Hola Mundo',
 'Help': 'ayuda',
-'here': 'here',
+'here': 'aquí',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'htmledit',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Si el reporte anterior contiene un número de tiquete este indica un falla en la ejecución del controlador, antes de cualquier intento de ejecutat doctests. Esto generalmente se debe a un error en la indentación o un error por fuera del código de la función.\r\nUn titulo verde indica que todas las pruebas pasaron (si existen). En dicho caso los resultados no se muestran.',
-'Image': 'Image',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'Image': 'Imagen',
+'import': 'import',
 'Import/Export': 'Importar/Exportar',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'incluye',
+'Indent with tabs': 'Indent with tabs',
 'insert new': 'inserte nuevo',
 'insert new %s': 'inserte nuevo %s',
-'inspect attributes': 'inspect attributes',
-'Install': 'instalar',
-'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
-'Installation of %(plugin)s for %(app)s app': 'Installation of %(plugin)s for %(app)s app',
+'inspect attributes': 'inspeccionar atributos',
+'Install': 'Instalar',
+'Installation of %(plugin)s for %(app)s': 'Instalación de %(plugin)s para %(app)s',
+'Installation of %(plugin)s for %(app)s app': 'Instalación de %(plugin)s para %(app)s app',
 'Installed applications': 'Aplicaciones instaladas',
-'Interaction at %s line %s': 'Interaction at %s line %s',
-'Interactive console': 'Interactive console',
+'Interaction at %s line %s': 'Interacción en %s línea %s',
+'Interactive console': 'Terminal interactiva',
 'internal error': 'error interno',
+'internal error: %s': 'internal error: %s',
 'Internal State': 'Estado Interno',
 'Invalid action': 'Acción inválida',
-'Invalid application name': 'Invalid application name',
+'Invalid application name': 'Nombre de aplicación no válido',
+'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'Correo inválido',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'contraseña inválida',
-'invalid password.': 'invalid password.',
+'invalid password.': 'contraseña inválida.',
 'Invalid Query': 'Consulta inválida',
 'invalid request': 'solicitud inválida',
-'Invalid request': 'Invalid request',
+'Invalid request': 'Petición inválida',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'tiquete inválido',
+'Key': 'Key',
 'Key bindings': 'Key bindings',
-'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
+'Key bindings for ZenCoding Plugin': 'Key bindings para el Plugin ZenCoding',
+'Keyboard shortcuts': 'Atajos de teclado',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'archivo de lenguaje "%(filename)s" creado/actualizado',
 'Language files (static strings) updated': 'Archivos de lenguaje (cadenas estáticas) actualizados',
 'languages': 'lenguajes',
 'Languages': 'Lenguajes',
 'languages updated': 'lenguajes actualizados',
 'Last name': 'Apellido',
+'Last Revision': 'Last Revision',
 'Last saved on:': 'Guardado en:',
 'License for': 'Licencia para',
-'License:': 'License:',
-'lists by ticket': 'lists by ticket',
+'License:': 'Licencia:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'listas por ticket',
+'Loading...': 'Loading...',
 'loading...': 'cargando...',
+'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals',
-'Login': 'Inicio de sesión',
 'login': 'inicio de sesión',
+'Login': 'Inicio de sesión',
+'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Inicio de sesión para la Interfaz Administrativa',
+'Login/Register': 'Login/Register',
 'Logout': 'fin de sesión',
+'lost password': 'lost password',
 'Lost Password': 'Contraseña perdida',
+'Main Menu': 'Main Menu',
 'manage': 'gestionar',
 'Manage': 'Gestionar',
-'Manage Cache': 'Manage Cache',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Administrar Caché',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
 'merge': 'combinar',
-'Models': 'Modelos',
 'models': 'modelos',
+'Models': 'Modelos',
+'Modified On': 'Modified On',
 'Modules': 'Módulos',
 'modules': 'módulos',
+'Multi User Mode': 'Multi User Mode',
 'Name': 'Nombre',
 'new application "%s" created': 'nueva aplicación "%s" creada',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'Asistente para nueva aplicación',
 'new plugin installed': 'nuevo plugin instalado',
-'New plugin installed: %s': 'New plugin installed: %s',
-'New plugin installed: web2py.plugin.attachment.w2p': 'New plugin installed: web2py.plugin.attachment.w2p',
-'New plugin installed: web2py.plugin.dialog.w2p': 'New plugin installed: web2py.plugin.dialog.w2p',
-'New plugin installed: web2py.plugin.math2py.w2p': 'New plugin installed: web2py.plugin.math2py.w2p',
-'New plugin installed: web2py.plugin.timezone.w2p': 'New plugin installed: web2py.plugin.timezone.w2p',
+'New plugin installed: %s': 'Nuevo plugin instalado: %s',
+'New plugin installed: web2py.plugin.attachment.w2p': 'Nuevo plugin instalado: web2py.plugin.attachment.w2p',
+'New plugin installed: web2py.plugin.dialog.w2p': 'Nuevo plugin instalado: web2py.plugin.dialog.w2p',
+'New plugin installed: web2py.plugin.math2py.w2p': 'Nuevo plugin instalado: web2py.plugin.math2py.w2p',
+'New plugin installed: web2py.plugin.timezone.w2p': 'Nuevo plugin instalado: web2py.plugin.timezone.w2p',
 'New Record': 'Registro nuevo',
 'new record inserted': 'nuevo registro insertado',
 'New simple application': 'Nueva aplicación',
-'next': 'next',
+'next': 'siguiente',
+'next %s rows': 'next %s rows',
 'next 100 rows': '100 filas siguientes',
 'NO': 'NO',
+'no changes': 'no changes',
 'No databases in this application': 'No hay bases de datos en esta aplicación',
-'No Interaction yet': 'No Interaction yet',
+'No Interaction yet': 'No hay interacción',
 'no match': 'no encontrado',
-'no package selected': 'no package selected',
-'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
-'online designer': 'online designer',
-'or alternatively': 'or alternatively',
+'no package selected': 'ningún paquete seleccionado',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'No ticket_storage.txt found under /private folder': 'No se encontró ticket_storage.txt en la carpeta /private',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'online designer': 'diseñador en línea',
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'o alternativamente',
 'Or Get from URL:': 'O obtener desde una URL:',
 'or import from csv file': 'o importar desde archivo CSV',
 'or provide app url:': 'o provea URL de la aplicación:',
 'or provide application url:': 'o provea URL de la aplicación:',
 'Origin': 'Origen',
 'Original/Translation': 'Original/Traducción',
-'Overview': 'Overview',
+'Overview': 'Revisión general',
 'Overwrite installed app': 'sobreescriba la aplicación instalada',
 'Pack all': 'empaquetar todo',
 'Pack compiled': 'empaquete compiladas',
@@ -300,170 +434,261 @@
 'PAM authenticated user, cannot change password here': 'usuario autenticado por PAM, no puede cambiar la contraseña aquí',
 'Password': 'Contraseña',
 'password changed': 'contraseña cambiada',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
 'Peeking at file': 'Visualizando archivo',
-'Please': 'Please',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Por favor',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'Plugin': 'Plugin',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" eliminado',
 'Plugin "%s" in application': 'Plugin "%s" en aplicación',
-'Plugin page': 'Plugin page',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Página del plugin',
 'plugins': 'plugins',
 'Plugins': 'Plugins',
+'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Este sitio usa',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': '100 filas anteriores',
 'Private files': 'Archivos privados',
 'private files': 'archivos privados',
-'Project Progress': 'Project Progress',
+'Project Progress': 'Progreso del  Proyecto',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
 'Query:': 'Consulta:',
 'RAM': 'RAM',
-'Rapid Search': 'Rapid Search',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Búsqueda rápida',
+'Record': 'Record',
 'record': 'registro',
 'record does not exist': 'el registro no existe',
 'record id': 'id de registro',
 'Record ID': 'ID de Registro',
-'refresh': 'refresh',
-'Register': 'Registrese',
+'Record id': 'Record id',
+'refresh': 'recargar',
+'register': 'register',
+'Register': 'Regístrese',
 'Registration key': 'Contraseña de Registro',
-'reload': 'reload',
-'Reload routes': 'Reload routes',
-'Remove compiled': 'eliminar compiladas',
+'reload': 'recargar',
+'Reload routes': 'Recargar rutas',
+'Remove compiled': 'eliminar compilados',
 'Removed Breakpoint on %s at line %s': 'Eliminado punto de ruptura en %s en la línea %s',
 'Replace': 'Reemplazar',
 'Replace All': 'Reemplazar todos',
-'Repository (%s)': 'Repository (%s)',
-'Repository: %s': 'Repository: %s',
-'request': 'request',
+'Repository (%s)': 'Repositorio (%s)',
+'Repository: %s': 'Repositorio: %s',
+'request': 'petición',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
 'Resolve Conflict file': 'archivo Resolución de Conflicto',
-'response': 'response',
+'response': 'respuesta',
+'restart': 'restart',
 'restore': 'restaurar',
 'return': 'return',
+'Revert': 'Revert',
 'revert': 'revertir',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
 'Role': 'Rol',
+'Roles': 'Roles',
 'Rows in table': 'Filas en la tabla',
+'Rows in Table': 'Rows in Table',
 'Rows selected': 'Filas seleccionadas',
-'rules are not defined': 'rules are not defined',
-'Run tests in this file': 'Run tests in this file',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
-'Running on %s': 'Running on %s',
-'Save': 'Save',
+'rules are not defined': 'reglas no están definidas',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Ejecute tests en este archivo',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Ejecute tests en este archivo (para ejecutarlo en todos los archivos, podrías usar el botón etiquetado como 'test')",
+'Running on %s': 'Ejecutando en %s',
+'Save': 'Guardar',
 'save': 'guardar',
-'Save file:': 'Guardar:',
-'Save file: %s': 'Guardar: %s',
-'Save via Ajax': 'Guardar via Ajax',
+'Save file:': 'Guardar archivo:',
+'Save file: %s': 'Guardar archivo: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Guardar vía Ajax',
 'Saved file hash:': 'Hash del archivo guardado:',
 'Screenshot %s': 'Screenshot %s',
 'Screenshots': 'Screenshots',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'seleccionado(s)',
-'session': 'session',
+'session': 'sesión',
 'session expired': 'sesión expirada',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
 'Set Breakpoint on %s at line %s: %s': 'Establecer punto de ruptura en %s en la línea %s: %s',
 'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
 'Site': 'sitio',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': 'algunos archivos no pudieron ser removidos',
-'source : filesystem': 'source : filesystem',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'fuente : sistema de archivos',
+'Start a new app': 'Start a new app',
 'Start searching': 'Iniciar búsqueda',
 'Start wizard': 'Iniciar asistente',
 'state': 'estado',
-'Static': 'Static',
+'Static': 'Estáticos',
 'static': 'estáticos',
 'Static files': 'Archivos estáticos',
-'Statistics': 'Statistics',
-'step': 'step',
-'stop': 'stop',
+'Statistics': 'Estadísticas',
+'Step': 'Step',
+'step': 'paso',
+'stop': 'parar',
 'submit': 'enviar',
-'Submit': 'Submit',
-'Success!': 'Success!',
+'Submit': 'Enviar',
+'Success!': '¡Éxito!',
 'successful': 'exitoso',
 'Sure you want to delete this object?': '¿Está seguro que desea eliminar este objeto?',
-'switch to : db': 'switch to : db',
+'switch to : db': 'cambiar a : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'tabla',
+'Table': 'Table',
 'Table name': 'Nombre de la tabla',
+'Temporary': 'Temporary',
 'test': 'probar',
 'Testing application': 'Probando aplicación',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La "consulta" es una condición como "db.tabla1.campo1==\'valor\'". Algo como "db.tabla1.campo1==db.tabla2.campo2" resulta en un JOIN SQL.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'La lógica de la aplicación, cada ruta URL se mapea en una función expuesta en el controlador',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'la lógica de la aplicación, cada ruta URL se mapea en una función expuesta en el controlador',
 'the data representation, define database tables and sets': 'la representación de datos, define tablas y conjuntos de base de datos',
 'The data representation, define database tables and sets': 'La representación de datos, define tablas y conjuntos de base de datos',
 'The presentations layer, views are also known as templates': 'La capa de presentación, las vistas también son llamadas plantillas',
 'the presentations layer, views are also known as templates': 'la capa de presentación, las vistas también son llamadas plantillas',
+'Theme': 'Theme',
 'There are no controllers': 'No hay controladores',
 'There are no models': 'No hay modelos',
 'There are no modules': 'No hay módulos',
 'There are no plugins': 'No hay plugins',
 'There are no private files': 'No hay archivos privados',
 'There are no static files': 'No hay archivos estáticos',
+'There are no translators': 'There are no translators',
 'There are no translators, only default language is supported': 'No hay traductores, sólo el lenguaje por defecto es soportado',
 'There are no views': 'No hay vistas',
-'These files are not served, they are only available from within your app': 'Estos archivos no son servidos, ellos solo estan disponibles para su aplicación',
-'These files are served without processing, your images go here': 'Estos archivos son servidos sin procesar, sus imágenes van aquí',
-'these files are served without processing, your images go here': 'estos archivos son servidos sin procesar, sus imágenes van aquí',
-'This is the %(filename)s template': 'Esta es la plantilla %(filename)s',
-'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
-'Ticket': 'Tiquete',
+'These files are not served, they are only available from within your app': 'Estos archivos no se proveen, ellos sólo están disponibles para su aplicación',
+'These files are served without processing, your images go here': 'Estos archivos se proveen sin procesar, sus imágenes van aquí',
+'these files are served without processing, your images go here': 'estos archivos se proveen sin procesar, sus imágenes van aquí',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'Está es la plantilla %(filename)s',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'esta página para ver si un punto de ruptura fue configurado y la depuración es requerida.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Ticket',
 'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': 'Timestamp',
 'TM': 'MR',
 'to  previous version.': 'a la versión previa.',
 'To create a plugin, name a file/folder plugin_[name]': 'Para crear un plugin, nombre un archivo/carpeta plugin_[nombre]',
-'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
-'to use the debugger!': 'to use the debugger!',
+'To emulate a breakpoint programatically, write:': 'Para emular un punto de ruptura programáticamente, escriba',
+'to use the debugger!': '¡usar el debugger!',
 'toggle breakpoint': 'alternar punto de ruptura',
-'Toggle comment': 'Toggle comment',
+'Toggle comment': 'Alternar comentario',
 'Toggle Fullscreen': 'Alternar pantalla completa',
-'Traceback': 'Traceback',
+'Traceback': 'Rastreo',
 'translation strings for the application': 'cadenas de caracteres de traducción para la aplicación',
 'Translation strings for the application': 'Cadenas de caracteres de traducción para la aplicación',
 'try': 'intente',
 'try something like': 'intente algo como',
 'Try the mobile interface': 'Pruebe la interfaz móvil',
-'try view': 'try view',
-'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'try view': 'Pruebe la vista',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Escriba algún código Python aquí y teclee la tecla Enter para ejecutarlo',
 'Unable to check for upgrades': 'No es posible verificar la existencia de actualizaciones',
 'unable to create application "%s"': 'no es posible crear la aplicación "%s"',
 'unable to delete file "%(filename)s"': 'no es posible eliminar el archivo "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'no es posible eliminar plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
 'Unable to download': 'No es posible la descarga',
 'Unable to download app': 'No es posible descargar la aplicación',
 'Unable to download app because:': 'No es posible descargar la aplicación porque:',
 'Unable to download because': 'No es posible descargar porque',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'no es posible analizar el archivo CSV',
 'unable to uninstall "%s"': 'no es posible instalar "%s"',
 'unable to upgrade because "%s"': 'no es posible actualizar porque "%s"',
 'uncheck all': 'desmarcar todos',
 'Uninstall': 'desinstalar',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'actualizar',
 'update all languages': 'actualizar todos los lenguajes',
 'Update:': 'Actualice:',
+'Upgrade': 'Upgrade',
 'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'actualize web2py ahora',
+'upload': 'upload',
 'Upload': 'Subir',
 'Upload & install packed application': 'Suba e instale aplicación empaquetada',
 'Upload a package:': 'Subir un paquete:',
 'Upload and install packed application': 'Suba e instale una aplicación empaquetada',
 'upload application:': 'subir aplicación:',
 'Upload existing application': 'Suba esta aplicación',
-'upload file:': 'suba archivo:',
-'upload plugin file:': 'suba archivo de plugin:',
+'upload file:': 'suba un archivo:',
+'upload plugin file:': 'suba un archivo de plugin:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, y ~(...) para NOT, para crear consultas más complejas.',
+'User': 'User',
 'User ID': 'ID de Usuario',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
 'Version': 'Versión',
+'Versioning': 'Versiones',
 'versioning': 'versiones',
-'Versioning': 'Versioning',
 'view': 'vista',
 'Views': 'Vistas',
 'views': 'vistas',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
 'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py está actualizado',
-'web2py online debugger': 'web2py online debugger',
+'web2py online debugger': 'web2py debugger en línea',
 'web2py Recent Tweets': 'Tweets Recientes de web2py',
+'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py actualizado; favor reiniciar',
 'Welcome to web2py': 'Bienvenido a web2py',
-'YES': 'SI',
-'Yes': 'Yes',
-'You are going to install': 'You are going to install',
-'You need to set up and reach a': 'You need to set up and reach a',
-'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
-'Your can inspect variables using the console below': 'Your can inspect variables using the console below',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'SÍ',
+'Yes': 'Sí',
+'You are going to install': 'Vas a instalar',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'Puedes inspeccionar las variables utilizando la terminal de abajo',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'Necesitas configurar y obtener un',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Tu aplicación será bloqueada hasta que des click en un botón de acción (siguiente, paso, continuar, etc.)',
 }

applications/admin/languages/fr.py

@@ -1,279 +1,649 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'fr',
 '!langname!': 'Français',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" est une expression en option tels que "field1 = \'newvalue\'". Vous ne pouvez pas mettre à jour ou supprimer les résultats d\'une jointure "a JOIN"',
-'%Y-%m-%d': '%d-%m-%Y',
-'%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': 'lignes %s supprimées',
 '%s %%{row} updated': 'lignes %s mises à jour',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%d-%m-%Y',
+'%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
+'(**%.0d MB**)': '(**%.0d MB**)',
+'(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
 '(requires internet access)': '(nécessite un accès Internet)',
+'(requires internet access, experimental)': '(nécessite un accès Internet, expérimentale)',
 '(something like "it-it")': '(quelque chose comme "it-it") ',
+'(version %s)': '(version %s)',
+'**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
+'?': '?',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
 '@markmin\x01Searching: **%s** %%{file}': 'Cherche: **%s** fichiers',
+'``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 'A new version of web2py is available: %s': 'Une nouvelle version de web2py est disponible: %s ',
 'A new version of web2py is available: Version 1.68.2 (2009-10-21 09:59:29)\n': 'Une nouvelle version de web2py est disponible: Version 1.68.2 (2009-10-21 09:59:29)\r\n',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: nécessite une connexion sécurisée (HTTPS) ou être en localhost. ',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: les tests ne sont pas thread-safe DONC NE PAS EFFECTUER DES TESTS MULTIPLES SIMULTANÉMENT.',
-'ATTENTION: you cannot edit the running application!': "ATTENTION: vous ne pouvez pas modifier l'application qui tourne!",
-'About': 'à propos',
-'About application': "A propos de l'application",
+'Abort': 'Abort',
+'About': 'À propos',
+'About application': "À propos de l'application",
+'Accept Terms': 'Termes acceptés',
+'Add breakpoint': 'Ajouter une interruption',
+'additional code for your application': 'code supplémentaire pour votre application',
 'Additional code for your application': 'Code additionnel pour votre application',
+'Admin design page': 'Page de conception admin',
+'admin disabled because no admin password': 'admin désactivée car aucun mot de passe admin',
+'admin disabled because not supported on google app engine': 'admin désactivée car non prise en charge sur Google Apps engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': "admin désactivée car incapable d'accéder au fichier mot de passe",
 'Admin is disabled because insecure channel': 'Admin est désactivé parce que canal non sécurisé',
 'Admin language': "Language de l'admin",
-'Administrator Password:': 'Mot de passe Administrateur:',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': "interface d'administration",
+'Administrator Password:': "Mot de passe de l'administrateur:",
+'An error occured, please [[reload %s]] the page': 'Une erreur c’est produite, s’il vous plait [[reload %s]] la page',
+'and rename it (required):': 'et renommez-la (obligatoire):',
+'and rename it:': 'et renommez-le:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'appadmin est désactivé parce que canal non sécurisé',
+'Application': 'Application',
+'application "%s" uninstalled': 'application "%s" désinstallée',
+'application %(appname)s installed with md5sum: %(digest)s': 'application %(appname)s installée avec md5sum: %(digest)s',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'application compilée',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': "l'application est compilée et ne peut être modifiée",
 'Application name:': "Nom de l'application:",
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'ne sont pas utilisé',
+'are not used yet': 'ne sont pas encore utilisé',
 'Are you sure you want to delete file "%s"?': 'Êtes-vous sûr de vouloir supprimer le fichier «%s»?',
 'Are you sure you want to delete plugin "%s"?': 'Êtes-vous sûr de vouloir supprimer le plugin "%s"?',
 'Are you sure you want to delete this object?': 'Êtes-vous sûr de vouloir supprimer cet objet?',
 'Are you sure you want to uninstall application "%s"?': "Êtes-vous sûr de vouloir désinstaller l'application «%s»?",
 'Are you sure you want to upgrade web2py now?': 'Êtes-vous sûr de vouloir mettre à jour web2py maintenant?',
-'Available databases and tables': 'Bases de données et tables disponible',
+'Are you sure?': 'Êtes vous sûr?',
+'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: nécessite une connexion sécurisée (HTTPS) ou être en localhost. ',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: les tests ne sont pas thread-safe DONC NE PAS EFFECTUER DES TESTS MULTIPLES SIMULTANÉMENT.',
+'ATTENTION: you cannot edit the running application!': "ATTENTION: vous ne pouvez pas modifier l'application qui tourne!",
+'Autocomplete Python Code': 'Autocomplete Python Code',
+'Available databases and tables': 'Bases de données et tables disponibles',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'retour',
+'Back to the plugins list': 'Retour à la liste de plugins',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Début',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'cache, erreurs et sessions nettoyés',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Annuler',
 'Cannot be empty': 'Ne peut pas être vide',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Ne peut pas compiler: il y a des erreurs dans votre application. corriger les erreurs et essayez à nouveau.',
 'Cannot compile: there are errors in your app:': 'Ne peut pas compiler: il y a des erreurs dans votre application:',
+'cannot create file': 'ne peut pas créer de fichier',
+'cannot upload file "%(filename)s"': 'ne peut pas charger le fichier "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Changer le mot de passe admin',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
+'check all': 'tout sélectionner',
 'Check for upgrades': 'Vérifier les mises à jour',
 'Check to delete': 'Cocher pour supprimer',
 'Checking for upgrades...': 'Vérification des mises à jour ... ',
 'Clean': 'nettoyer',
+'Clear': 'Effacer',
+'Clear CACHE?': 'Effacer le CACHE?',
+'Clear DISK': 'Effacer le DISQUE',
+'Clear RAM': 'Effacer la RAM',
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
+'click to check for upgrades': 'Cliquez pour vérifier les mises jour',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'tout réduire/agrandir',
+'Command': 'Commande',
+'Comment:': 'Commentaire:',
+'Commit': 'Valider',
+'Commit form': 'Valider le formulaire',
+'Committed files': 'Fichiers validés',
 'Compile': 'compiler',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'application compilée enlevée',
+'Condition': 'Condition',
+'continue': 'continuer',
 'Controllers': 'Contrôleurs',
+'controllers': 'contrôleurs',
+'Count': 'Compte',
 'Create': 'Créer',
+'create file with filename:': 'créer un fichier avec nom de fichier:',
+'create new application:': 'créer une nouvelle application:',
 'Create new simple application': 'Créer une nouvelle application',
+'Create/Upload': 'Create/Upload',
+'created by': 'créé par',
+'Created by:': 'Créé par:',
+'Created On': 'Créé le',
+'Created on:': 'Créé le:',
+'crontab': 'crontab',
 'Current request': 'Requête actuelle',
 'Current response': 'Réponse actuelle',
 'Current session': 'Session en cours',
-'Date and Time': 'Date et heure',
-'Delete': 'Supprimer',
-'Delete this file (you will be asked to confirm deletion)': 'Supprimer ce fichier (on vous demandera de confirmer la suppression)',
-'Delete:': 'Supprimer:',
-'Deploy': 'Déployer',
-'Deploy on Google App Engine': 'Déployer sur Google App Engine',
-'EDIT': 'MODIFIER',
-'Edit': 'modifier',
-'Edit application': "Modifier l'application",
-'Edit current record': 'Modifier cette entrée',
-'Editing Language file': 'Modifier le fichier de langue',
-'Editing file': 'Modifier le fichier',
-'Editing file "%s"': 'Modifier le fichier "% s" ',
-'Enterprise Web Framework': 'Enterprise Web Framework',
-'Error logs for "%(app)s"': 'Journal d\'erreurs pour "%(app)s"',
-'Errors': 'erreurs',
-'Exception instance attributes': "Attributs d'instance Exception",
-'Functions with no doctests will result in [passed] tests.': 'Des fonctions sans doctests entraîneront des tests [passed] .',
-'Help': 'aide',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': "Si le rapport ci-dessus contient un numéro de ticket, cela indique une défaillance dans l'exécution du contrôleur, avant toute tentative d'exécuter les doctests. Cela est généralement dû à une erreur d'indentation ou une erreur à l'extérieur du code de la fonction.\r\nUn titre vert indique que tous les tests (si définis) sont passés. Dans ce cas, les résultats des essais ne sont pas affichées.",
-'Import/Export': 'Importer/Exporter',
-'Install': 'Installer',
-'Installed applications': 'Applications installées',
-'Internal State': 'État Interne',
-'Invalid Query': 'Requête non valide',
-'Invalid action': 'Action non valide',
-'Language files (static strings) updated': 'Fichiers de langue (chaînes statiques) mis à jour ',
-'Languages': 'Langues',
-'Last saved on:': 'Dernière sauvegarde le:',
-'License for': 'Licence pour',
-'Login': 'Connexion',
-'Login to the Administrative Interface': "Se connecter à l'interface d'administration",
-'Logout': 'déconnexion',
-'Models': 'Modèles',
-'Modules': 'Modules',
-'NO': 'NON',
-'New Record': 'Nouvelle Entrée',
-'New application wizard': 'Assistant nouvelle application',
-'New simple application': 'Nouvelle application simple',
-'No databases in this application': 'Aucune base de données dans cette application',
-'Original/Translation': 'Original / Traduction',
-'Overwrite installed app': "Écraser l'application installée",
-'PAM authenticated user, cannot change password here': 'Utilisateur authentifié par PAM, vous ne pouvez pas changer le mot de passe ici',
-'Pack all': 'tout empaqueter',
-'Pack compiled': 'paquet compilé',
-'Peeking at file': 'Jeter un oeil au fichier',
-'Plugin "%s" in application': 'Plugin "%s" dans l\'application',
-'Plugins': 'Plugins',
-'Powered by': 'Propulsé par',
-'Query:': 'Requête: ',
-'Remove compiled': 'retirer compilé',
-'Resolve Conflict file': 'Résoudre les conflits de fichiers',
-'Rows in table': 'Lignes de la table',
-'Rows selected': 'Lignes sélectionnées',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Lancer les tests dans ce fichier (pour lancer tous les fichiers, vous pouvez également utiliser le bouton nommé 'test')",
-'Save': 'Enregistrer',
-'Saved file hash:': 'Hash du Fichier enregistré:',
-'Site': 'Site',
-'Start wizard': "Démarrer l'assistant",
-'Static files': 'Fichiers statiques',
-'Sure you want to delete this object?': 'Vous êtes sûr de vouloir supprimer cet objet? ',
-'TM': 'MD',
-'Testing application': "Test de l'application",
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La "requête" est une condition comme "db.table1.field1==\'value\'". Quelque chose comme "db.table1.field1==db.table2.field2" aboutit à un JOIN SQL.',
-'The application logic, each URL path is mapped in one exposed function in the controller': "La logique de l'application, chaque chemin d'URL est mappé avec une fonction exposée dans le contrôleur",
-'The data representation, define database tables and sets': 'La représentation des données, définir les tables et ensembles de la base de données',
-'The presentations layer, views are also known as templates': "Les couches de présentation, les vues sont également appelées modples",
-'There are no controllers': "Il n'y a pas de contrôleurs",
-'There are no models': "Il n'y a pas de modèles",
-'There are no modules': "Il n'y a pas de modules",
-'There are no plugins': "Il n'y a pas de plugins",
-'There are no static files': "Il n'y a pas de fichiers statiques",
-'There are no translators, only default language is supported': "Il n'y a pas de traducteurs, seule la langue par défaut est prise en charge",
-'There are no views': "Il n'y a pas de vues",
-'These files are served without processing, your images go here': 'Ces fichiers sont renvoyés sans traitement, vos images viennent ici',
-'This is the %(filename)s template': 'Ceci est le modèle %(filename)s ',
-'Ticket': 'Ticket',
-'To create a plugin, name a file/folder plugin_[name]': 'Pour créer un plugin, créer un fichier /dossier plugin_[nom]',
-'Translation strings for the application': "Chaînes de traduction pour l'application",
-'Unable to check for upgrades': 'Impossible de vérifier les mises à jour',
-'Unable to download': 'Impossible de télécharger',
-'Unable to download app': "Impossible de télécharger l'app",
-'Unable to download app because:': "Impossible de télécharger l'app car:",
-'Unable to download because': 'Impossible de télécharger car',
-'Uninstall': 'désinstaller',
-'Update:': 'Mise à jour:',
-'Upload & install packed application': "Charger & installer l'application empaquetée",
-'Upload a package:': 'Charger un paquet:',
-'Upload existing application': 'Charger une application existante',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Utilisez (...)&(...) pour AND, (...)|(...) pour OR, et ~(...) pour NOT afin de construire des requêtes plus complexes. ',
-'Use an url:': 'Utiliser une url:',
-'Version': 'Version',
-'Views': 'Vues',
-'Web Framework': 'Framework Web',
-'YES': 'OUI',
-'additional code for your application': 'code supplémentaire pour votre application',
-'admin disabled because no admin password': 'admin désactivée car aucun mot de passe admin',
-'admin disabled because not supported on google app engine': 'admin désactivée car non prise en charge sur Google Apps engine',
-'admin disabled because unable to access password file': "admin désactivée car incapable d'accéder au fichier mot de passe",
-'administrative interface': "interface d'administration",
-'and rename it (required):': 'et renommez-la (obligatoire):',
-'and rename it:': 'et renommez-le:',
-'appadmin': 'appadmin',
-'appadmin is disabled because insecure channel': 'appadmin est désactivé parce que canal non sécurisé',
-'application "%s" uninstalled': 'application "%s" désinstallée',
-'application %(appname)s installed with md5sum: %(digest)s': 'application %(appname)s installée avec md5sum: %(digest)s',
-'application compiled': 'application compilée',
-'application is compiled and cannot be designed': "l'application est compilée et ne peut être modifiée",
-'arguments': 'arguments',
-'back': 'retour',
-'cache': 'cache',
-'cache, errors and sessions cleaned': 'cache, erreurs et sessions nettoyés',
-'cannot create file': 'ne peut pas créer de fichier',
-'cannot upload file "%(filename)s"': 'ne peut pas charger le fichier "%(filename)s"',
-'check all': 'tout vérifier ',
-'click to check for upgrades': 'Cliquez pour vérifier les mises jour',
-'code': 'code',
-'collapse/expand all': 'tout réduire/agrandir',
-'compiled application removed': 'application compilée enlevée',
-'controllers': 'contrôleurs',
-'create file with filename:': 'créer un fichier avec nom de fichier:',
-'create new application:': 'créer une nouvelle application:',
-'created by': 'créé par',
-'crontab': 'crontab',
 'currently running': 'tourne actuellement',
 'currently saved or': 'actuellement enregistré ou',
-'data uploaded': 'données chargées',
+'data uploaded': 'données téléversées',
+'Database': 'Base de données',
 'database': 'base de données',
-'database %s select': 'base de données  %s sélectionner',
+'Database %s select': 'Database %s select',
+'database %s select': 'base de données %s sélectionner',
+'Database administration': 'Administration base de données',
 'database administration': 'administration base de données',
-'db': 'bdd',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Date and Time': 'Date et heure',
+'db': 'bd',
+'Debug': 'Debug',
 'defines tables': 'définit les tables',
+'Delete': 'Supprimer',
 'delete': 'supprimer',
 'delete all checked': 'supprimer tout ce qui est coché',
 'delete plugin': ' supprimer le plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Supprimer ce fichier (on vous demandera de confirmer la suppression)',
+'Delete:': 'Supprimer:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Démo',
+'Deploy': 'Déployer',
+'Deploy on Google App Engine': 'Déployer sur Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
 'design': 'conception',
+'Detailed traceback description': 'Detailed traceback description',
+'details': 'détails',
 'direction: ltr': 'direction: ltr',
-'docs': 'docs',
+'directory not found': 'directory not found',
+'Disable': 'Désactiver',
+'Disabled': 'Désactivé',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISQUE',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disque effacé',
+'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'documents',
+'Docs': 'Documents',
 'done!': 'fait!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
 'download layouts': 'télécharger layouts',
+'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'télécharger plugins',
+'Download plugins from repository': 'Download plugins from repository',
+'EDIT': 'MODIFIER',
+'Edit': 'Modifier',
+'edit all': 'tout modifier',
+'Edit application': "Modifier l'application",
 'edit controller': 'modifier contrôleur',
-'edit views:': 'modifier vues:',
+'edit controller:': 'modifier le contrôleur:',
+'Edit current record': 'Modifier cet enregistrement',
+'edit views:': 'modifier les vues:',
+'Editing %s': 'Modifier %s',
+'Editing file': 'Modifier le fichier',
+'Editing file "%s"': 'Modifier le fichier "% s" ',
+'Editing Language file': 'Modifier le fichier de langue',
+'Editing Plural Forms File': 'Modifier le fichier du formulaire pluriel',
+'Editor': 'Éditeur',
+'Email Address': 'Adresse courriel',
+'Enable': 'Activer',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
+'Enterprise Web Framework': 'Enterprise Web Framework',
+'Error': 'Error',
+'Error logs for "%(app)s"': 'Journal d\'erreurs pour "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': "Billet d'erreur",
+'Errors': 'Erreurs',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': "Attributs d'instance Exception",
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'export au format CSV',
+'Exports:': 'Exportions:',
 'exposes': 'expose',
 'exposes:': 'expose:',
 'extends': 'étend',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module': 'impossible de recharger le module',
 'failed to reload module because:': 'impossible de recharger le module car:',
+'File': 'Fichier',
 'file "%(filename)s" created': 'fichier "%(filename)s" créé',
 'file "%(filename)s" deleted': 'fichier "%(filename)s" supprimé',
 'file "%(filename)s" uploaded': 'fichier "%(filename)s" chargé',
 'file "%s" of %s restored': 'fichier "%s" de %s restauré',
 'file changed on disk': 'fichier modifié sur le disque',
 'file does not exist': "fichier n'existe pas",
+'file not found': 'file not found',
 'file saved on %(time)s': 'fichier enregistré le %(time)s',
 'file saved on %s': 'fichier enregistré le %s',
+'filename': 'nom de fichier',
+'Filename': 'Nom de fichier',
+'Files added': 'Fichiers ajoutés',
 'filter': 'filtre',
+'Find Next': 'Trouver les suivants',
+'Find Previous': 'Trouver les précédents',
+'Form has errors': 'Le formulaire comporte des erreurs',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Des fonctions sans doctests entraîneront des tests [passed] .',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'Mot de passe GAE',
+'Generate': 'Générer',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'représentation graphique du modèle',
+'Graph Model': 'Représentation graphique du modèle',
+'Help': 'aide',
+'here': 'ici',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+'Hits': 'Hits',
+'Home': 'Accueil',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'edition html',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': "Si le rapport ci-dessus contient un numéro de ticket, cela indique une défaillance dans l'exécution du contrôleur, avant toute tentative d'exécuter les doctests. Cela est généralement dû à une erreur d'indentation ou une erreur à l'extérieur du code de la fonction.\r\nUn titre vert indique que tous les tests (si définis) sont passés. Dans ce cas, les résultats des essais ne sont pas affichées.",
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'importer',
+'Import/Export': 'Importer/Exporter',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'inclus',
+'Indent with tabs': 'Indent with tabs',
 'index': 'index',
 'insert new': 'insérer nouveau',
 'insert new %s': 'insérer nouveau %s',
+'inspect attributes': 'inspect attributes',
+'Install': 'Installer',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': 'Applications installées',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'erreur interne',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'État Interne',
+'Invalid action': 'Action non valide',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'mot de passe invalide',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Requête non valide',
 'invalid request': 'Demande incorrecte',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'ticket non valide',
+'Key': 'Clé',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'fichier de langue "%(filename)s" créé/mis à jour',
+'Language files (static strings) updated': 'Fichiers de langue (chaînes statiques) mis à jour ',
 'languages': 'langues',
-'loading...': 'Chargement ...',
+'Languages': 'Langues',
+'Last Revision': 'Dernière révision',
+'Last saved on:': 'Dernière sauvegarde le:',
+'License for': 'Licence pour',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Chargement...',
+'loading...': 'chargement ...',
+'Local Apps': 'Local Apps',
+'locals': 'locals',
+'Locals##debug': 'Locals##debug',
+'Login': 'Connexion',
 'login': 'connexion',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': "Se connecter à l'interface d'administration",
+'Login/Register': 'Login/Register',
+'Logout': 'déconnexion',
+'lost password': 'mot de passe perdu',
+'Main Menu': 'Main Menu',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
+"Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
 'merge': 'fusionner',
+'Models': 'Modèles',
 'models': 'modèles',
+'Modified On': 'Modifié le',
+'Modules': 'Modules',
 'modules': 'modules',
+'Multi User Mode': 'Multi User Mode',
 'new application "%s" created': 'nouvelle application "%s" créée',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
+'New application wizard': 'Assistant nouvelle application',
 'new plugin installed': 'nouveau plugin installé',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'Nouvelle Entrée',
 'new record inserted': 'nouvelle entrée insérée',
+'New simple application': 'Nouvelle application simple',
+'next': 'suivant',
+'next %s rows': '%s lignes suivantes',
 'next 100 rows': '100 lignes suivantes',
+'NO': 'NON',
+'no changes': 'no changes',
+'No databases in this application': 'Aucune base de données dans cette application',
+'No Interaction yet': 'No Interaction yet',
 'no match': 'aucune correspondance',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Pas autorisé',
+'Not supported': 'Pas supporté',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Number of entries: **%s**': 'Number of entries: **%s**',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'ou importer depuis un fichier CSV ',
 'or provide app url:': "ou fournir l'URL de l'app:",
 'or provide application url:': "ou fournir l'URL de l'application:",
+'Original/Translation': 'Original / Traduction',
+'Overview': 'Overview',
+'Overwrite installed app': "Écraser l'application installée",
+'Pack all': 'tout empaqueter',
+'Pack compiled': 'paquet compilé',
+'Pack custom': 'Pack custom',
 'pack plugin': 'paquet plugin',
+'PAM authenticated user, cannot change password here': 'Utilisateur authentifié par PAM, vous ne pouvez pas changer le mot de passe ici',
 'password changed': 'mot de passe modifié',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Jeter un oeil au fichier',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'SVP',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" supprimé',
-'plugins': 'plugins',
+'Plugin "%s" in application': 'Plugin "%s" dans l\'application',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
+'plugins': 'plugiciels',
+'Plugins': 'Plugiciels',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Propulsé par',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': '100 lignes précédentes',
-'record': 'entrée',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Pousser',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Requête: ',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'Rapid Search': 'Recherche rapide',
+'Record': 'Enregistrement',
+'record': 'enregistrement',
 'record does not exist': "l'entrée n'existe pas",
 'record id': 'id entrée',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Reload routes': 'Reload routes',
+'Remove compiled': 'retirer compilé',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Remplacer',
+'Replace All': 'Tout remplacer',
+'Repository (%s)': 'Repository (%s)',
+'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Résoudre les conflits de fichiers',
+'response': 'response',
+'restart': 'redémarrer',
 'restore': 'restaurer',
-'revert': 'revenir',
-'save': 'sauver',
+'return': 'retour',
+'Revert': "Revenir vers l'arrière",
+'revert': "revenir vers l'arrière",
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Révision %s',
+'Revision:': 'Révision:',
+'Role': 'Rôle',
+'Roles': 'Rôles',
+'Rows in Table': 'Rows in Table',
+'Rows in table': 'Lignes de la table',
+'Rows selected': 'Lignes sélectionnées',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Lancer les tests dans ce fichier (pour lancer tous les fichiers, vous pouvez également utiliser le bouton nommé 'test')",
+'Running on %s': 'Running on %s',
+'Save': 'Sauvegarder',
+'save': 'sauvegarder',
+'Save file:': 'Sauvegarder le fichier:',
+'Save file: %s': 'Sauvegarder le fichier : %s',
+'Save model as...': 'Sauvegarder le modèle sous...',
+'Save via Ajax': 'Sauvegarder via Ajax',
+'Saved file hash:': 'Hash du Fichier enregistré:',
+'Screenshot %s': "Capture d'écran %s",
+'Search': 'Rechercher',
+'Searching: **%s** %%{file}': 'Searching: **%s** %%{file}',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'sélectionnés',
+'session': 'session',
 'session expired': 'la session a expiré ',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': 'Site',
+'Size of cache:': 'Taille de la mémoire cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': 'certains fichiers ne peuvent pas être supprimés',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : système de fichier',
+'Start a new app': 'Commencer une nouvelle application',
+'Start searching': 'Débuté la recherche',
+'Start wizard': "Démarrer l'assistant",
 'state': 'état',
-'static': 'statiques',
+'Static': 'Statique',
+'static': 'statique',
+'Static files': 'Fichiers statiques',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'arrêt',
 'submit': 'envoyer',
+'Submit': 'Envoyer',
+'successful': 'réussi',
+'Sure you want to delete this object?': 'Vous êtes sûr de vouloir supprimer cet objet?',
+'switch to : db': 'transférer dans : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'table',
+'Table': 'Table',
+'Temporary': 'Temporaire',
 'test': 'tester',
+'Testing application': "Test de l'application",
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La "requête" est une condition comme "db.table1.field1==\'value\'". Quelque chose comme "db.table1.field1==db.table2.field2" aboutit à un JOIN SQL.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': "la logique de l'application, chaque chemin d'URL est mappé dans une fonction exposée dans le contrôleur",
+'The application logic, each URL path is mapped in one exposed function in the controller': "La logique de l'application, chaque chemin d'URL est mappé avec une fonction exposée dans le contrôleur",
 'the data representation, define database tables and sets': 'La représentation des données, définir les tables et ensembles de la base de données',
+'The data representation, define database tables and sets': 'La représentation des données, définir les tables et ensembles de la base de données',
+'The presentations layer, views are also known as templates': 'Les couches de présentation, les vues sont également appelées modples',
 'the presentations layer, views are also known as templates': 'la couche de présentation, les vues sont également appelées modèles',
+'Theme': 'Thème',
+'There are no controllers': "Il n'y a pas de contrôleurs",
+'There are no models': "Il n'y a pas de modèles",
+'There are no modules': "Il n'y a pas de modules",
+'There are no plugins': "Il n'y a pas de plugins",
+'There are no private files': "Il n'y a pas de fichiers privés",
+'There are no static files': "Il n'y a pas de fichiers statiques",
+'There are no translators': "Il n'y a pas de traducteurs",
+'There are no translators, only default language is supported': "Il n'y a pas de traducteurs, seule la langue par défaut est prise en charge",
+'There are no views': "Il n'y a pas de vues",
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'Ces fichiers sont renvoyés sans traitement, vos images viennent ici',
 'these files are served without processing, your images go here': 'ces fichiers sont servis sans transformation, vos images vont ici',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'Ceci est le modèle %(filename)s ',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Billet',
+'Ticket ID': 'Identifiant du Billet',
+'Ticket Missing': 'Billet manquant',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'TM': 'MD',
 'to  previous version.': 'à la version précédente.',
+'To create a plugin, name a file/folder plugin_[name]': 'Pour créer un plugin, créer un fichier /dossier plugin_[nom]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
 'translation strings for the application': "chaînes de traduction de l'application",
+'Translation strings for the application': "Chaînes de traduction pour l'application",
 'try': 'essayer',
 'try something like': 'essayez quelque chose comme',
+'Try the mobile interface': "Essayer l'interface pour mobile",
+'try view': 'essayer la vue',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Impossible de vérifier les mises à jour',
 'unable to create application "%s"': 'impossible de créer l\'application  "%s"',
 'unable to delete file "%(filename)s"': 'impossible de supprimer le fichier "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'impossible de supprimer le plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download': 'Impossible de télécharger',
+'Unable to download app': "Impossible de télécharger l'app",
+'Unable to download app because:': "Impossible de télécharger l'app car:",
+'Unable to download because': 'Impossible de télécharger car',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': "impossible d'analyser les fichiers CSV",
 'unable to uninstall "%s"': 'impossible de désinstaller "%s"',
 'unable to upgrade because "%s"': 'impossible de mettre à jour car "%s"',
 'uncheck all': 'tout décocher',
+'Uninstall': 'désinstaller',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'mettre à jour',
 'update all languages': 'mettre à jour toutes les langues',
+'Update:': 'Mise à jour:',
+'Upgrade': 'Mese à jour de version',
 'upgrade now': 'mettre à jour maintenant',
+'upgrade now to %s': 'mettre à jour maintenant à %s',
 'upgrade web2py now': 'mettre à jour web2py maintenant',
-'upload': 'charger',
-'upload application:': "charger l'application:",
-'upload file:': 'charger le fichier:',
+'upload': 'téléversé',
+'Upload': 'Téléversé',
+'Upload & install packed application': "Charger & installer l'application empaquetée",
+'Upload a package:': 'Téléverser un paquet:',
+'Upload and install packed application': 'Téléversement et installation du paquet applicatif',
+'upload application:': "téléverser l'application:",
+'Upload existing application': 'Téléverser une application existante',
+'upload file:': 'téléverser le fichier:',
 'upload plugin file:': 'charger fichier plugin:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Utilisez (...)&(...) pour AND, (...)|(...) pour OR, et ~(...) pour NOT afin de construire des requêtes plus complexes. ',
+'Use an url:': 'Utiliser une url:',
 'user': 'utilisateur',
+'User': 'Utilisateur',
+'Username': "Nom d'utilisateur",
+'Users': 'Utilisateurs',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Version': 'Version',
+'Versioning': 'Versioning',
 'versioning': 'versioning',
 'view': 'vue',
+'Views': 'Vues',
 'views': 'vues',
-'web2py Recent Tweets': 'Tweets récents sur web2py ',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Cadre Web',
+'web2py Admin Password': 'Mot de passe admin web2py',
+'web2py apps to deploy': 'applications web2py à deployer',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py est à jour',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'Tweets récents sur web2py ',
+'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py mis à jour; veuillez le redémarrer',
+'Working...': 'Travail en cours...',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'OUI',
+'Yes': 'Oui',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/he.py

@@ -1,271 +1,622 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'he-il',
 '!langname!': 'עברית',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"עדכן" הוא ביטוי אופציונאלי, כגון "field1=newvalue". אינך יוכל להשתמש בjoin, בעת שימוש ב"עדכן" או "מחק".',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s רשומות נמחקו',
 '%s %%{row} updated': '%s רשומות עודכנו',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '(requires internet access)': '(requires internet access)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(למשל "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
 'A new version of web2py is available: %s': 'גירסא חדשה של web2py זמינה: %s',
+'Abort': 'Abort',
+'About': 'אודות',
+'About application': 'אודות אפליקציה',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
+'additional code for your application': 'קוד נוסף עבור האפליקציה שלך',
+'Additional code for your application': 'Additional code for your application',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': 'ממשק המנהל מנוטרל כי לא הוגדרה סיסמת מנהל',
+'admin disabled because not supported on google app engine': 'ממשק המנהל נוטרל, כי אין תמיכה בGoogle app engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': 'ממשק מנהל נוטרל, כי לא ניתן לגשת לקובץ הסיסמאות',
+'Admin is disabled because insecure channel': 'ממשק האדמין נוטרל בשל גישה לא מאובטחת',
+'Admin language': 'Admin language',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'administrative interface',
+'Administrator Password:': 'סיסמת מנהל',
+'and rename it (required):': 'ושנה את שמו (חובה):',
+'and rename it:': 'ושנה את שמו:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'מנהל מסד הנתונים',
+'appadmin is disabled because insecure channel': 'מנהל מסד הנתונים נוטרל בשל ערוץ לא מאובטח',
+'Application': 'Application',
+'application "%s" uninstalled': 'אפליקציה "%s" הוסרה',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'אפליקציה קומפלה',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'לא ניתן לערוך אפליקציה מקומפלת',
+'Application name:': 'Application name:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
+'Are you sure you want to delete file "%s"?': 'האם אתה בטוח שברצונך למחוק את הקובץ "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'האם אתה בטוח שברצונך למחוק את התוסף "%s"?',
+'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Are you sure you want to uninstall application "%s"?': 'האם אתה בטוח שברצונך להסיר את האפליקציה "%s"?',
+'Are you sure you want to upgrade web2py now?': 'האם אתה בטוח שאתה רוצה לשדרג את web2py עכשיו?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'פרמטרים',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'לתשומת ליבך: ניתן להתחבר רק בערוץ מאובטח (HTTPS) או מlocalhost',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'לתשומת ליבך: אין לערוך מספר בדיקות במקביל, שכן הן עשויות להפריע זו לזו',
 'ATTENTION: you cannot edit the running application!': 'לתשומת ליבך: לא ניתן לערוך אפליקציה בזמן הרצתה',
-'About': 'אודות',
-'About application': 'אודות אפליקציה',
-'Additional code for your application': 'Additional code for your application',
-'Admin is disabled because insecure channel': 'ממשק האדמין נוטרל בשל גישה לא מאובטחת',
-'Admin language': 'Admin language',
-'Administrator Password:': 'סיסמת מנהל',
-'Application name:': 'Application name:',
-'Are you sure you want to delete file "%s"?': 'האם אתה בטוח שברצונך למחוק את הקובץ "%s"?',
-'Are you sure you want to delete plugin "%s"?': 'האם אתה בטוח שברצונך למחוק את התוסף "%s"?',
-'Are you sure you want to uninstall application "%s"?': 'האם אתה בטוח שברצונך להסיר את האפליקציה "%s"?',
-'Are you sure you want to upgrade web2py now?': 'האם אתה בטוח שאתה רוצה לשדרג את web2py עכשיו?',
+'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'מסדי נתונים וטבלאות זמינים',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'אחורה',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'מטמון',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'מטמון, שגיאות וסשן נוקו',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
 'Cannot be empty': 'אינו יכול להישאר ריק',
 'Cannot compile: there are errors in your app:': 'לא ניתן לקמפל: ישנן שגיאות באפליקציה שלך:',
+'cannot create file': 'לא מצליח ליצור קובץ',
+'cannot upload file "%(filename)s"': 'לא הצלחתי להעלות את הקובץ "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'סיסמת מנהל שונתה',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
+'check all': 'סמן הכל',
 'Check for upgrades': 'check for upgrades',
 'Check to delete': 'סמן כדי למחוק',
 'Checking for upgrades...': 'מחפש עדכונים',
 'Clean': 'נקה',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
+'click to check for upgrades': 'לחץ כדי לחפש עדכונים',
+'code': 'קוד',
+'Code listing': 'Code listing',
+'collapse/expand all': 'collapse/expand all',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'קמפל',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'אפליקציה מקומפלת הוסרה',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controllers': 'בקרים',
+'controllers': 'בקרים',
+'Count': 'Count',
 'Create': 'צור',
+'create file with filename:': 'צור קובץ בשם:',
+'create new application:': 'צור אפליקציה חדשה:',
 'Create new simple application': 'צור אפליקציה חדשה',
+'Create/Upload': 'Create/Upload',
+'created by': 'נוצר ע"י',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': 'משימות מתוזמנות',
 'Current request': 'בקשה נוכחית',
 'Current response': 'מענה נוכחי',
 'Current session': 'סשן זה',
+'currently running': 'currently running',
+'currently saved or': 'נשמר כעת או',
+'data uploaded': 'המידע הועלה',
+'Database': 'Database',
+'database': 'מסד נתונים',
+'Database %s select': 'Database %s select',
+'database %s select': 'מסד הנתונים %s נבחר',
+'Database administration': 'Database administration',
+'database administration': 'ניהול מסד נתונים',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'תאריך ושעה',
+'db': 'מסד נתונים',
+'Debug': 'Debug',
+'defines tables': 'הגדר טבלאות',
 'Delete': 'מחק',
+'delete': 'מחק',
+'delete all checked': 'סמן הכל למחיקה',
+'delete plugin': 'מחק תוסף',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
 'Delete:': 'מחק:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
 'Deploy': 'deploy',
 'Deploy on Google App Engine': 'העלה ל Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
+'design': 'עיצוב',
 'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
+'direction: ltr': 'direction: rtl',
+'directory not found': 'directory not found',
+'Disable': 'Disable',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
+'done!': 'הסתיים!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
+'download layouts': 'download layouts',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'download plugins',
+'Download plugins from repository': 'Download plugins from repository',
 'EDIT': 'ערוך!',
 'Edit': 'ערוך',
+'edit all': 'edit all',
 'Edit application': 'ערוך אפליקציה',
+'edit controller': 'ערוך בקר',
+'edit controller:': 'edit controller:',
 'Edit current record': 'ערוך רשומה נוכחית',
-'Editing Language file': 'עורך את קובץ השפה',
+'edit views:': 'ערוך קיבצי תצוגה:',
+'Editing %s': 'Editing %s',
 'Editing file "%s"': 'עורך את הקובץ "%s"',
+'Editing Language file': 'עורך את קובץ השפה',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'Enterprise Web Framework': 'סביבת הפיתוח לרשת',
+'Error': 'Error',
 'Error logs for "%(app)s"': 'דו"ח שגיאות עבור אפליקציה "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'שגיאות',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
 'Exception instance attributes': 'נתוני החריגה',
-'Frames': 'Frames',
-'Functions with no doctests will result in [passed] tests.': 'פונקציות שלא הוגדר להן doctest ירשמו כבדיקות ש[עברו בהצלחה].',
-'Help': 'עזרה',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'אם בדו"ח לעיל מופיע מספר דו"ח שגיאה, זה מצביע על שגיאה בבקר, עוד לפני שניתן היה להריץ את הdoctest. לרוב מדובר בשגיאת הזחה, או שגיאה שאינה בקוד של הפונקציה.\r\nכותרת ירוקה מצביע על כך שכל הבדיקות (אם הוגדרו) עברו בהצלחה, במידה ותוצאות הבדיקה אינן מופיעות.',
-'Import/Export': 'יבא\יצא',
-'Install': 'התקן',
-'Installed applications': 'אפליקציות מותקנות',
-'Internal State': 'מצב מובנה',
-'Invalid Query': 'שאילתה לא תקינה',
-'Invalid action': 'הוראה לא קיימת',
-'Language files (static strings) updated': 'קובץ השפה (מחרוזות סטאטיות) עודכן',
-'Languages': 'שפות',
-'Last saved on:': 'לאחרונה נשמר בתאריך:',
-'License for': 'רשיון עבור',
-'Login': 'התחבר',
-'Login to the Administrative Interface': 'התחבר לממשק המנהל',
-'Logout': 'התנתק',
-'Models': 'מבני נתונים',
-'Modules': 'מודולים',
-'NO': 'לא',
-'New Record': 'רשומה חדשה',
-'New application wizard': 'New application wizard',
-'New simple application': 'New simple application',
-'No databases in this application': 'אין מסדי נתונים לאפליקציה זו',
-'Original/Translation': 'מקור\תרגום',
-'Overwrite installed app': 'התקן על גבי אפלקציה מותקנת',
-'PAM authenticated user, cannot change password here': 'שינוי סיסמא באמצעות PAM אינו יכול להתבצע כאן',
-'Pack all': 'ארוז הכל',
-'Pack compiled': 'ארוז מקומפל',
-'Peeking at file': 'מעיין בקובץ',
-'Plugin "%s" in application': 'פלאגין "%s" של אפליקציה',
-'Plugins': 'תוספים',
-'Powered by': 'מופעל ע"י',
-'Query:': 'שאילתה:',
-'Remove compiled': 'הסר מקומפל',
-'Resolve Conflict file': 'הסר קובץ היוצר קונפליקט',
-'Rows in table': 'רשומות בטבלה',
-'Rows selected': 'רשומות נבחרו',
-'Saved file hash:': 'גיבוב הקובץ השמור:',
-'Site': 'אתר',
-'Start wizard': 'start wizard',
-'Static files': 'קבצים סטאטיים',
-'Sure you want to delete this object?': 'האם אתה בטוח שברצונך למחוק אובייקט זה?',
-'TM': 'סימן רשום',
-'Testing application': 'בודק את האפליקציה',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"שאליתה" היא תנאי כגון "db1.table1.filed1=\'value\'" ביטוי כמו db.table1.field1=db.table2.field1 יחולל join',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
-'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'There are no controllers': 'אין בקרים',
-'There are no models': 'אין מבני נתונים',
-'There are no modules': 'אין מודולים',
-'There are no plugins': 'There are no plugins',
-'There are no static files': 'אין קבצים סטאטיים',
-'There are no translators, only default language is supported': 'אין תרגומים. רק שפת ברירת המחדל נתמכת',
-'There are no views': 'אין קבצי תצוגה',
-'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'This is the %(filename)s template': 'זוהי תבנית הקובץ %(filename)s ',
-'Ticket': 'דו"ח שגיאה',
-'Ticket ID': 'Ticket ID',
-'To create a plugin, name a file/folder plugin_[name]': 'כדי ליצור תוסף, קרא לקובץ או סיפריה בשם לפי התבנית plugin_[name]',
-'Traceback': 'Traceback',
-'Translation strings for the application': 'Translation strings for the application',
-'Unable to check for upgrades': 'לא ניתן היה לבדוק אם יש שדרוגים',
-'Unable to download app because:': 'לא ניתן היה להוריד את האפליקציה כי:',
-'Unable to download because': 'לא הצלחתי להוריד כי',
-'Uninstall': 'הסר התקנה',
-'Update:': 'עדכן:',
-'Upload & install packed application': 'העלה והתקן אפליקציה ארוזה',
-'Upload a package:': 'Upload a package:',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'השתמש ב (...)&(...) עבור תנאי AND, (...)|(...) עבור תנאי OR ו~(...) עבור תנאי NOT ליצירת שאילתות מורכבות',
-'Use an url:': 'Use an url:',
-'Version': 'גירסא',
-'Views': 'מראה',
-'YES': 'כן',
-'additional code for your application': 'קוד נוסף עבור האפליקציה שלך',
-'admin disabled because no admin password': 'ממשק המנהל מנוטרל כי לא הוגדרה סיסמת מנהל',
-'admin disabled because not supported on google app engine': 'ממשק המנהל נוטרל, כי אין תמיכה בGoogle app engine',
-'admin disabled because unable to access password file': 'ממשק מנהל נוטרל, כי לא ניתן לגשת לקובץ הסיסמאות',
-'administrative interface': 'administrative interface',
-'and rename it (required):': 'ושנה את שמו (חובה):',
-'and rename it:': 'ושנה את שמו:',
-'appadmin': 'מנהל מסד הנתונים',
-'appadmin is disabled because insecure channel': 'מנהל מסד הנתונים נוטרל בשל ערוץ לא מאובטח',
-'application "%s" uninstalled': 'אפליקציה "%s" הוסרה',
-'application compiled': 'אפליקציה קומפלה',
-'application is compiled and cannot be designed': 'לא ניתן לערוך אפליקציה מקומפלת',
-'arguments': 'פרמטרים',
-'back': 'אחורה',
-'cache': 'מטמון',
-'cache, errors and sessions cleaned': 'מטמון, שגיאות וסשן נוקו',
-'cannot create file': 'לא מצליח ליצור קובץ',
-'cannot upload file "%(filename)s"': 'לא הצלחתי להעלות את הקובץ "%(filename)s"',
-'check all': 'סמן הכל',
-'click to check for upgrades': 'לחץ כדי לחפש עדכונים',
-'code': 'קוד',
-'collapse/expand all': 'collapse/expand all',
-'compiled application removed': 'אפליקציה מקומפלת הוסרה',
-'controllers': 'בקרים',
-'create file with filename:': 'צור קובץ בשם:',
-'create new application:': 'צור אפליקציה חדשה:',
-'created by': 'נוצר ע"י',
-'crontab': 'משימות מתוזמנות',
-'currently running': 'currently running',
-'currently saved or': 'נשמר כעת או',
-'data uploaded': 'המידע הועלה',
-'database': 'מסד נתונים',
-'database %s select': 'מסד הנתונים %s נבחר',
-'database administration': 'ניהול מסד נתונים',
-'db': 'מסד נתונים',
-'defines tables': 'הגדר טבלאות',
-'delete': 'מחק',
-'delete all checked': 'סמן הכל למחיקה',
-'delete plugin': 'מחק תוסף',
-'design': 'עיצוב',
-'direction: ltr': 'direction: rtl',
-'done!': 'הסתיים!',
-'download layouts': 'download layouts',
-'download plugins': 'download plugins',
-'edit controller': 'ערוך בקר',
-'edit views:': 'ערוך קיבצי תצוגה:',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'יצא לקובץ csv',
+'Exports:': 'Exports:',
 'exposes': 'חושף את',
+'exposes:': 'exposes:',
 'extends': 'הרחבה של',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module because:': 'נכשל בטעינה חוזרת של מודול בגלל:',
+'File': 'File',
 'file "%(filename)s" created': 'הקובץ "%(filename)s" נוצר',
 'file "%(filename)s" deleted': 'הקובץ "%(filename)s" נמחק',
 'file "%(filename)s" uploaded': 'הקובץ "%(filename)s" הועלה',
 'file "%s" of %s restored': 'הקובץ "%s" of %s שוחזר',
 'file changed on disk': 'קובץ שונה על גבי הדיסק',
 'file does not exist': 'קובץ לא נמצא',
+'file not found': 'file not found',
 'file saved on %(time)s': 'הקובץ נשמר בשעה %(time)s',
 'file saved on %s': 'הקובץ נשמר ב%s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
 'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'Form has errors': 'Form has errors',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'פונקציות שלא הוגדר להן doctest ירשמו כבדיקות ש[עברו בהצלחה].',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Help': 'עזרה',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'עורך ויזואלי',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'אם בדו"ח לעיל מופיע מספר דו"ח שגיאה, זה מצביע על שגיאה בבקר, עוד לפני שניתן היה להריץ את הdoctest. לרוב מדובר בשגיאת הזחה, או שגיאה שאינה בקוד של הפונקציה.\r\nכותרת ירוקה מצביע על כך שכל הבדיקות (אם הוגדרו) עברו בהצלחה, במידה ותוצאות הבדיקה אינן מופיעות.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'יבא\\יצא',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'מכיל',
+'Indent with tabs': 'Indent with tabs',
 'insert new': 'הכנס נוסף',
 'insert new %s': 'הכנס %s נוסף',
 'inspect attributes': 'inspect attributes',
+'Install': 'התקן',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': 'אפליקציות מותקנות',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'שגיאה מובנית',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'מצב מובנה',
+'Invalid action': 'הוראה לא קיימת',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'סיסמא שגויה',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'שאילתה לא תקינה',
 'invalid request': 'בקשה לא תקינה',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'דו"ח שגיאה לא קיים',
-'language file "%(filename)s" created/updated': 'קובץ השפה "%(filename)s" נוצר\עודכן',
+'Key': 'Key',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
+'language file "%(filename)s" created/updated': 'קובץ השפה "%(filename)s" נוצר\\עודכן',
+'Language files (static strings) updated': 'קובץ השפה (מחרוזות סטאטיות) עודכן',
 'languages': 'שפות',
+'Languages': 'שפות',
+'Last Revision': 'Last Revision',
+'Last saved on:': 'לאחרונה נשמר בתאריך:',
+'License for': 'רשיון עבור',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': 'טוען...',
+'Local Apps': 'Local Apps',
 'locals': 'locals',
+'Locals##debug': 'Locals##debug',
+'Login': 'התחבר',
 'login': 'התחבר',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'התחבר לממשק המנהל',
+'Login/Register': 'Login/Register',
+'Logout': 'התנתק',
+'lost password': 'lost password',
+'Main Menu': 'Main Menu',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
 'merge': 'מזג',
+'Models': 'מבני נתונים',
 'models': 'מבני נתונים',
+'Modified On': 'Modified On',
+'Modules': 'מודולים',
 'modules': 'מודולים',
+'Multi User Mode': 'Multi User Mode',
 'new application "%s" created': 'האפליקציה "%s" נוצרה',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
+'New application wizard': 'New application wizard',
 'new plugin installed': 'פלאגין חדש הותקן',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'רשומה חדשה',
 'new record inserted': 'הרשומה נוספה',
+'New simple application': 'New simple application',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': '100 הרשומות הבאות',
+'NO': 'לא',
+'no changes': 'no changes',
+'No databases in this application': 'אין מסדי נתונים לאפליקציה זו',
+'No Interaction yet': 'No Interaction yet',
 'no match': 'לא נמצאה התאמה',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'או יבא מקובץ csv',
 'or provide app url:': 'או ספק כתובת url של אפליקציה',
+'Original/Translation': 'מקור\\תרגום',
+'Overview': 'Overview',
+'Overwrite installed app': 'התקן על גבי אפלקציה מותקנת',
+'Pack all': 'ארוז הכל',
+'Pack compiled': 'ארוז מקומפל',
+'Pack custom': 'Pack custom',
 'pack plugin': 'ארוז תוסף',
+'PAM authenticated user, cannot change password here': 'שינוי סיסמא באמצעות PAM אינו יכול להתבצע כאן',
 'password changed': 'סיסמא שונתה',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'מעיין בקובץ',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'תוסף "%(plugin)s" נמחק',
+'Plugin "%s" in application': 'פלאגין "%s" של אפליקציה',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
 'plugins': 'plugins',
+'Plugins': 'תוספים',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'מופעל ע"י',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': '100 הרשומות הקודמות',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'שאילתה:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
 'record': 'רשומה',
 'record does not exist': 'הרשומה אינה קיימת',
 'record id': 'מזהה רשומה',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Reload routes': 'Reload routes',
+'Remove compiled': 'הסר מקומפל',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'הסר קובץ היוצר קונפליקט',
 'response': 'response',
+'restart': 'restart',
 'restore': 'שחזר',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'חזור לגירסא קודמת',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in Table': 'Rows in Table',
+'Rows in table': 'רשומות בטבלה',
+'Rows selected': 'רשומות נבחרו',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Running on %s',
+'Save': 'Save',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'גיבוב הקובץ השמור:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'נבחרו',
 'session': 'session',
 'session expired': 'תם הסשן',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'שורת פקודה',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': 'אתר',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': 'לא ניתן היה להסיר חלק מהקבצים',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Start searching',
+'Start wizard': 'start wizard',
 'state': 'מצב',
+'Static': 'Static',
 'static': 'קבצים סטאטיים',
+'Static files': 'קבצים סטאטיים',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
 'submit': 'שלח',
+'Submit': 'Submit',
+'successful': 'successful',
+'Sure you want to delete this object?': 'האם אתה בטוח שברצונך למחוק אובייקט זה?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'טבלה',
+'Table': 'Table',
+'Temporary': 'Temporary',
 'test': 'בדיקות',
+'Testing application': 'בודק את האפליקציה',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"שאליתה" היא תנאי כגון "db1.table1.filed1=\'value\'" ביטוי כמו db.table1.field1=db.table2.field1 יחולל join',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'הלוגיקה של האפליקציה, כל url ממופה לפונקציה חשופה בבקר',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'the data representation, define database tables and sets': 'ייצוג המידע, בו מוגדרים טבלאות ומבנים',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
 'the presentations layer, views are also known as templates': 'שכבת התצוגה, המכונה גם template',
+'Theme': 'Theme',
+'There are no controllers': 'אין בקרים',
+'There are no models': 'אין מבני נתונים',
+'There are no modules': 'אין מודולים',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': 'אין קבצים סטאטיים',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': 'אין תרגומים. רק שפת ברירת המחדל נתמכת',
+'There are no views': 'אין קבצי תצוגה',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'אלו הם קבצים הנשלחים מהשרת ללא עיבוד. הכנס את התמונות כאן',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'זוהי תבנית הקובץ %(filename)s ',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'דו"ח שגיאה',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'TM': 'סימן רשום',
 'to  previous version.': 'אין גירסא קודמת',
+'To create a plugin, name a file/folder plugin_[name]': 'כדי ליצור תוסף, קרא לקובץ או סיפריה בשם לפי התבנית plugin_[name]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
 'translation strings for the application': 'מחרוזות תרגום עבור האפליקציה',
+'Translation strings for the application': 'Translation strings for the application',
 'try': 'נסה',
 'try something like': 'נסה משהו כמו',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'לא ניתן היה לבדוק אם יש שדרוגים',
 'unable to create application "%s"': 'נכשל ביצירת האפליקציה "%s"',
 'unable to delete file "%(filename)s"': 'נכשל במחיקת הקובץ "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'נכשל במחיקת התוסף "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download app because:': 'לא ניתן היה להוריד את האפליקציה כי:',
+'Unable to download because': 'לא הצלחתי להוריד כי',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'לא הצלחתי לנתח את הקלט של קובץ csv',
 'unable to uninstall "%s"': 'לא ניתן להסיר את "%s"',
 'unable to upgrade because "%s"': 'לא ניתן היה לשדרג כי "%s"',
 'uncheck all': 'הסר סימון מהכל',
+'Uninstall': 'הסר התקנה',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'עדכן',
 'update all languages': 'עדכן את כלל קיבצי השפה',
+'Update:': 'עדכן:',
+'Upgrade': 'Upgrade',
 'upgrade now': 'upgrade now',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'שדרג את web2py עכשיו',
 'upload': 'upload',
+'Upload': 'Upload',
+'Upload & install packed application': 'העלה והתקן אפליקציה ארוזה',
+'Upload a package:': 'Upload a package:',
+'Upload and install packed application': 'Upload and install packed application',
 'upload application:': 'העלה אפליקציה:',
 'upload file:': 'העלה קובץ:',
 'upload plugin file:': 'העלה קובץ תוסף:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'השתמש ב (...)&(...) עבור תנאי AND, (...)|(...) עבור תנאי OR ו~(...) עבור תנאי NOT ליצירת שאילתות מורכבות',
+'Use an url:': 'Use an url:',
+'User': 'User',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'משתנים',
+'Version': 'גירסא',
+'Versioning': 'Versioning',
 'versioning': 'מנגנון גירסאות',
 'view': 'הצג',
+'Views': 'מראה',
 'views': 'מראה',
-'web2py Recent Tweets': 'ציוצים אחרונים של web2py',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py מותקנת בגירסתה האחרונה',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'ציוצים אחרונים של web2py',
+'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py שודרגה; נא אתחל אותה',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'כן',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/it.py

@@ -3,37 +3,54 @@
 '!langcode!': 'it',
 '!langname!': 'Italiano',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" è un\'espressione opzionale come "campo1=\'nuovo valore\'". Non si può fare "update" o "delete" dei risultati di un JOIN ',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s righe ("record") cancellate',
 '%s %%{row} updated': '%s righe ("record") modificate',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
 '%Y-%m-%d': '%d/%m/%Y',
 '%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
 '(requires internet access)': '(requires internet access)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(qualcosa simile a "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
 'A new version of web2py is available: %s': 'È disponibile una nuova versione di web2py: %s',
+'Abort': 'Abort',
 'About': 'informazioni',
 'About application': "Informazioni sull'applicazione",
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
 'additional code for your application': 'righe di codice aggiuntive per la tua applicazione',
 'Additional code for your application': 'Additional code for your application',
+'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'amministrazione disabilitata per mancanza di password amministrativa',
 'admin disabled because not supported on google app engine': 'amministrazione non supportata da Google Apps Engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'amministrazione disabilitata per impossibilità di leggere il file delle password',
 'Admin is disabled because insecure channel': 'amministrazione disabilitata: comunicazione non sicura',
 'Admin language': 'Admin language',
+'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'administrative interface',
 'Administrator Password:': 'Password Amministratore:',
 'An error occured, please %s the page': 'An error occured, please %s the page',
 'and rename it (required):': 'e rinominala (obbligatorio):',
 'and rename it:': 'e rinominala:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin ',
 'appadmin is disabled because insecure channel': 'amministrazione app (appadmin) disabilitata: comunicazione non sicura',
+'Application': 'Application',
 'application "%s" uninstalled': 'applicazione "%s" disinstallata',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
 'application compiled': 'applicazione compilata',
+'Application exists already': 'Application exists already',
 'application is compiled and cannot be designed': "l'applicazione è compilata e non si può modificare",
 'Application name:': 'Application name:',
+'Application updated via git pull': 'Application updated via git pull',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Confermi di voler cancellare il file "%s"?',
@@ -41,45 +58,85 @@
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'Are you sure you want to uninstall application "%s"?': 'Confermi di voler disinstallare l\'applicazione "%s"?',
 'Are you sure you want to upgrade web2py now?': 'Confermi di voler aggiornare web2py ora?',
+'Are you sure?': 'Are you sure?',
 'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': "ATTENZIONE: L'accesso richiede una connessione sicura (HTTPS) o l'esecuzione di web2py in locale (connessione su localhost)",
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTZIONE: NON ESEGUIRE PIÙ TEST IN PARALLELO (I TEST NON SONO "THREAD SAFE")',
 'ATTENTION: you cannot edit the running application!': "ATTENZIONE: non puoi modificare l'applicazione correntemente in uso ",
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Database e tabelle disponibili',
+'Available Databases and Tables': 'Available Databases and Tables',
 'back': 'indietro',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
 'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
 'cache, errors and sessions cleaned': 'pulitura cache, errori and sessioni ',
 'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
 'Cannot be empty': 'Non può essere vuoto',
 'Cannot compile: there are errors in your app:': "Compilazione fallita: ci sono errori nell'applicazione.",
 'cannot create file': 'impossibile creare il file',
 'cannot upload file "%(filename)s"': 'impossibile caricare il file "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
 'change editor settings': 'change editor settings',
 'change password': 'cambia password',
+'Changelog': 'Changelog',
 'check all': 'controlla tutto',
 'Check for upgrades': 'check for upgrades',
 'Check to delete': 'Seleziona per cancellare',
 'Checking for upgrades...': 'Controllo aggiornamenti in corso...',
 'Clean': 'pulisci',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
 'click here for online examples': 'clicca per vedere gli esempi',
 'click here for the administrative interface': "clicca per l'interfaccia amministrativa",
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'clicca per controllare presenza di aggiornamenti',
 'code': 'code',
+'Code listing': 'Code listing',
 'collapse/expand all': 'collapse/expand all',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'compila',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': "rimosso il codice compilato dell'applicazione",
+'Condition': 'Condition',
+'continue': 'continue',
 'Controller': 'Controller',
 'Controllers': 'Controllers',
 'controllers': 'controllers',
 'Copyright': 'Copyright',
+'Count': 'Count',
 'Create': 'crea',
 'create file with filename:': 'crea un file col nome:',
 'create new application:': 'create new application:',
 'Create new simple application': 'Crea nuova applicazione',
 'Create/Upload': 'Create/Upload',
 'created by': 'creato da',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
 'crontab': 'crontab',
 'Current request': 'Richiesta (request) corrente',
 'Current response': 'Risposta (response) corrente',
@@ -90,8 +147,11 @@
 'data uploaded': 'dati caricati',
 'Database': 'Database',
 'database': 'database',
+'Database %s select': 'Database %s select',
 'database %s select': 'database %s select',
+'Database administration': 'Database administration',
 'database administration': 'amministrazione database',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Data and Ora',
 'db': 'db',
 'DB Model': 'Modello di DB',
@@ -103,19 +163,44 @@
 'delete plugin': 'cancella plugin',
 'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
 'Delete:': 'Cancella:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
 'Deploy': 'deploy',
 'Deploy on Google App Engine': 'Installa su Google App Engine',
 'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
 'design': 'progetta',
 'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
 'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
 'Disable': 'Disable',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'docs',
+'Docs': 'Docs',
 'done!': 'fatto!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
 'download layouts': 'download layouts',
+'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
+'Download plugins from repository': 'Download plugins from repository',
 'EDIT': 'MODIFICA',
 'Edit': 'modifica',
+'edit all': 'edit all',
 'Edit application': 'Modifica applicazione',
 'edit controller': 'modifica controller',
 'edit controller:': 'edit controller:',
@@ -124,96 +209,187 @@
 'Edit This App': 'Modifica questa applicazione',
 'edit views:': 'modifica viste (view):',
 'Editing %s': 'Editing %s',
+'Editing Language file': 'Editing Language file',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'Enterprise Web Framework': 'Enterprise Web Framework',
+'Error': 'Error',
 'Error logs for "%(app)s"': 'Log degli errori per "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'errori',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Exception instance attributes',
 'Exit Fullscreen': 'Exit Fullscreen',
 'Expand Abbreviation': 'Expand Abbreviation',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'esporta come file CSV',
+'Exports:': 'Exports:',
 'exposes': 'espone',
 'exposes:': 'exposes:',
 'extends': 'estende',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module because:': 'ricaricamento modulo fallito perché:',
+'File': 'File',
 'file "%(filename)s" created': 'creato il file "%(filename)s"',
 'file "%(filename)s" deleted': 'cancellato il file "%(filename)s"',
 'file "%(filename)s" uploaded': 'caricato il file "%(filename)s"',
 'file "%s" of %s restored': 'ripristinato "%(filename)s"',
 'file changed on disk': 'il file ha subito una modifica su disco',
 'file does not exist': 'file inesistente',
+'file not found': 'file not found',
 'file saved on %(time)s': "file salvato nell'istante %(time)s",
 'file saved on %s': 'file salvato: %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
 'filter': 'filter',
 'Find Next': 'Find Next',
 'Find Previous': 'Find Previous',
+'Form has errors': 'Form has errors',
 'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'I test delle funzioni senza "doctests" risulteranno sempre [passed].',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
 'Get from URL:': 'Get from URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
 'graph model': 'graph model',
+'Graph Model': 'Graph Model',
 'Hello World': 'Salve Mondo',
 'Help': 'aiuto',
+'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'modifica come html',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
 'Import/Export': 'Importa/Esporta',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'include',
+'Indent with tabs': 'Indent with tabs',
 'Index': 'Indice',
 'insert new': 'inserisci nuovo',
 'insert new %s': 'inserisci nuovo %s',
 'inspect attributes': 'inspect attributes',
 'Install': 'installa',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Applicazioni installate',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'errore interno',
+'internal error: %s': 'internal error: %s',
 'Internal State': 'Stato interno',
 'Invalid action': 'Azione non valida',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'password non valida',
+'invalid password.': 'invalid password.',
 'Invalid Query': 'Richiesta (query) non valida',
 'invalid request': 'richiesta non valida',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'ticket non valido',
+'Key': 'Key',
 'Key bindings': 'Key bindings',
 'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'file linguaggio "%(filename)s" creato/aggiornato',
 'Language files (static strings) updated': 'Linguaggi (documenti con stringhe statiche) aggiornati',
 'languages': 'linguaggi',
 'Languages': 'Linguaggi',
+'Last Revision': 'Last Revision',
 'Last saved on:': 'Ultimo salvataggio:',
 'Layout': 'Layout',
 'License for': 'Licenza relativa a',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': 'caricamento...',
+'Local Apps': 'Local Apps',
 'locals': 'locals',
+'Locals##debug': 'Locals##debug',
 'Login': 'Accesso',
 'login': 'accesso',
+'Login successful': 'Login successful',
 'Login to the Administrative Interface': "Accesso all'interfaccia amministrativa",
+'Login/Register': 'Login/Register',
 'Logout': 'uscita',
+'lost password': 'lost password',
 'Main Menu': 'Menu principale',
 'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
 'Menu Model': 'Menu Modelli',
 'merge': 'unisci',
 'Models': 'Modelli',
 'models': 'modelli',
+'Modified On': 'Modified On',
 'Modules': 'Moduli',
 'modules': 'moduli',
+'Multi User Mode': 'Multi User Mode',
 'new application "%s" created': 'creata la nuova applicazione "%s"',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
 'new plugin installed': 'installato nuovo plugin',
+'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Nuovo elemento (record)',
 'new record inserted': 'nuovo record inserito',
 'New simple application': 'New simple application',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': 'prossime 100 righe',
 'NO': 'NO',
+'no changes': 'no changes',
 'No databases in this application': 'Nessun database presente in questa applicazione',
+'No Interaction yet': 'No Interaction yet',
 'no match': 'nessuna corrispondenza',
 'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'online designer',
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'oppure importa da file CSV',
 'or provide app url:': "oppure fornisci url dell'applicazione:",
 'Original/Translation': 'Originale/Traduzione',
+'Overview': 'Overview',
 'Overwrite installed app': 'sovrascrivi applicazione installata',
 'Pack all': 'crea pacchetto',
 'Pack compiled': 'crea pacchetto del codice compilato',
@@ -221,87 +397,170 @@
 'pack plugin': 'crea pacchetto del plugin',
 'PAM authenticated user, cannot change password here': 'utente autenticato tramite PAM, impossibile modificare password qui',
 'password changed': 'password modificata',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
 'Peeking at file': 'Uno sguardo al file',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" cancellato',
 'Plugin "%s" in application': 'Plugin "%s" nell\'applicazione',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
 'plugins': 'plugins',
 'Plugins': 'I Plugins',
+'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Powered by',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': '100 righe precedenti',
 'Private files': 'Private files',
 'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
 'Query:': 'Richiesta (query):',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
 'Rapid Search': 'Rapid Search',
+'Record': 'Record',
 'record': 'record',
 'record does not exist': 'il record non esiste',
 'record id': 'ID del record',
+'Record id': 'Record id',
+'refresh': 'refresh',
 'register': 'registrazione',
 'reload': 'reload',
 'Reload routes': 'Reload routes',
 'Remove compiled': 'rimozione codice compilato',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
 'Resolve Conflict file': 'File di risoluzione conflitto',
 'response': 'response',
+'restart': 'restart',
 'restore': 'ripristino',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'versione precedente',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
 'Rows in table': 'Righe nella tabella',
+'Rows in Table': 'Rows in Table',
 'Rows selected': 'Righe selezionate',
 'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
 'Save': 'Save',
 'Save file:': 'Save file:',
 'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
 'Save via Ajax': 'Save via Ajax',
 'Saved file hash:': 'Hash del file salvato:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'selezionato',
 'session': 'session',
 'session expired': 'sessions scaduta',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
 'Site': 'sito',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': 'non è stato possibile rimuovere alcuni files',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
 'Start searching': 'Start searching',
 'Start wizard': 'start wizard',
 'state': 'stato',
-'static': 'statico',
 'Static': 'Static',
+'static': 'statico',
 'Static files': 'Files statici',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
 'Stylesheet': 'Foglio di stile (stylesheet)',
-'Submit': 'Submit',
 'submit': 'invia',
+'Submit': 'Submit',
 'successful': 'successful',
 'Sure you want to delete this object?': 'Vuoi veramente cancellare questo oggetto?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'tabella',
+'Table': 'Table',
+'Temporary': 'Temporary',
 'test': 'test',
 'Testing application': 'Test applicazione in corsg',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La richiesta (query) è una condizione come ad esempio  "db.tabella1.campo1==\'valore\'". Una condizione come "db.tabella1.campo1==db.tabella2.campo2" produce un "JOIN" SQL.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'logica dell\'applicazione, ogni percorso "URL" corrisponde ad una funzione esposta da un controller',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'the data representation, define database tables and sets': 'rappresentazione dei dati, definizione di tabelle di database e di "set" ',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
 'the presentations layer, views are also known as templates': 'Presentazione dell\'applicazione, viste (views, chiamate anche "templates")',
+'Theme': 'Theme',
 'There are no controllers': 'Non ci sono controller',
 'There are no models': 'Non ci sono modelli',
 'There are no modules': 'Non ci sono moduli',
 'There are no plugins': 'There are no plugins',
 'There are no private files': 'There are no private files',
 'There are no static files': 'Non ci sono file statici',
+'There are no translators': 'There are no translators',
 'There are no translators, only default language is supported': 'Non ci sono traduzioni, viene solo supportato il linguaggio di base',
 'There are no views': 'Non ci sono viste ("view")',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'questi files vengono serviti così come sono, le immagini vanno qui',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'Questo è il template %(filename)s',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
 'Ticket': 'Ticket',
 'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'TM': 'TM',
 'to  previous version.': 'torna a versione precedente',
 'To create a plugin, name a file/folder plugin_[name]': 'Per creare un plugin, chiamare un file o cartella plugin_[nome]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
 'toggle breakpoint': 'toggle breakpoint',
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
@@ -312,21 +571,31 @@
 'try something like': 'prova qualcosa come',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Impossibile controllare presenza di aggiornamenti',
 'unable to create application "%s"': 'impossibile creare applicazione "%s"',
 'unable to delete file "%(filename)s"': 'impossibile rimuovere file "%(plugin)s"',
 'unable to delete file plugin "%(plugin)s"': 'impossibile rimuovere file di plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
 'Unable to download app because:': 'Impossibile scaricare applicazione perché',
 'Unable to download because': 'Impossibile scaricare perché',
 'Unable to download because:': 'Unable to download because:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'non riesco a decodificare questo file CSV',
 'unable to uninstall "%s"': 'impossibile disinstallare "%s"',
 'unable to upgrade because "%s"': 'impossibile aggiornare perché "%s"',
 'uncheck all': 'smarca tutti',
-'Uninstall': 'disinstalla',
+'Uninstall': 'Disinstalla',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'aggiorna',
 'update all languages': 'aggiorna tutti i linguaggi',
 'Update:': 'Aggiorna:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'upgrade web2py now',
 'upload': 'upload',
 'Upload': 'Upload',
@@ -338,21 +607,43 @@
 'upload plugin file:': 'carica file di plugin:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Per costruire richieste (query) più complesse si usano (...)&(...) come "e" (AND), (...)|(...) come "o" (OR), e ~(...) come negazione (NOT).',
 'Use an url:': 'Use an url:',
+'User': 'User',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
 'Version': 'Versione',
 'Version %s.%s.%s %s (%s)': 'Version %s.%s.%s %s (%s)',
 'Version %s.%s.%s (%s) %s': 'Version %s.%s.%s (%s) %s',
-'versioning': 'sistema di versioni',
 'Versioning': 'Versioning',
+'versioning': 'sistema di versioni',
 'View': 'Vista',
 'view': 'vista',
-'Views': 'viste',
+'Views': 'Viste',
 'views': 'viste',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
 'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py è aggiornato',
+'web2py online debugger': 'web2py online debugger',
 'web2py Recent Tweets': 'Tweets recenti per web2py',
+'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py aggiornato; prego riavviarlo',
 'Welcome %s': 'Benvenuto %s',
 'Welcome to web2py': 'Benvenuto su web2py',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
 'YES': 'SI',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/ja.py

@@ -1,189 +1,586 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'ja-jp',
 '!langname!': '日本語',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s rows deleted',
 '%s %%{row} updated': '%s rows updated',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '(requires internet access)': '(インターネットアクセスが必要)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(例: "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
 '@markmin\x01Searching: **%s** %%{file}': '検索中: **%s** ファイル',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': '注意: 安全(HTTPS)な接続でログインするかlocalhostで実行されている必要があります。',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': '注意: テストはスレッドセーフではないので複数のテストを同時に実行しないでください。',
-'ATTENTION: you cannot edit the running application!': '注意: 実行中のアプリケーションは編集できません!',
 'Abort': '中断',
 'About': 'About',
 'About application': 'アプリケーションについて',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
 'Additional code for your application': 'アプリケーションに必要な追加記述',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': 'admin disabled because no admin password',
+'admin disabled because not supported on google app engine': 'admin disabled because not supported on google app engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': 'admin disabled because unable to access password file',
+'Admin is disabled because insecure channel': 'Admin is disabled because insecure channel',
 'Admin language': '管理画面の言語',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': '管理画面',
 'Administrator Password:': '管理者パスワード:',
+'and rename it:': 'ファイル名を変更:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'アプリ管理画面',
+'appadmin is disabled because insecure channel': 'appadmin is disabled because insecure channel',
+'Application': 'Application',
+'application "%s" uninstalled': '"%s"アプリケーションが削除されました',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'アプリケーションがコンパイルされました',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
 'Application name:': 'アプリケーション名:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
+'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
 'Are you sure you want to delete plugin "%s"?': '"%s"プラグインを削除してもよろしいですか？',
 'Are you sure you want to delete this object?': 'このオブジェクトを削除してもよろしいですか？',
 'Are you sure you want to uninstall application "%s"?': '"%s"アプリケーションを削除してもよろしいですか？',
+'Are you sure?': 'Are you sure?',
+'arguments': '引数',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': '注意: 安全(HTTPS)な接続でログインするかlocalhostで実行されている必要があります。',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': '注意: テストはスレッドセーフではないので複数のテストを同時に実行しないでください。',
+'ATTENTION: you cannot edit the running application!': '注意: 実行中のアプリケーションは編集できません!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': '利用可能なデータベースとテーブル一覧',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': '戻る',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
 'Basics': '基本情報',
 'Begin': '開始',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'cache, errors and sessions cleaned',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
+'Cannot be empty': 'Cannot be empty',
+'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
+'cannot create file': 'cannot create file',
+'cannot upload file "%(filename)s"': '"%(filename)s"ファイルをアップロードできません',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': '管理者パスワード変更',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
+'check all': '全てを選択',
 'Check for upgrades': '更新チェック',
+'Check to delete': 'Check to delete',
 'Checking for upgrades...': '更新を確認中...',
 'Clean': '一時データ削除',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
 'Click row to expand traceback': '列をクリックしてトレースバックを展開',
+'Click row to view a ticket': 'Click row to view a ticket',
+'code': 'コード',
+'Code listing': 'Code listing',
+'collapse/expand all': '全て開閉する',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'コンパイル',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'コンパイル済みのアプリケーションが削除されました',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controllers': 'コントローラ',
+'controllers': 'コントローラ',
 'Count': '回数',
 'Create': '作成',
+'create file with filename:': 'ファイル名:',
+'Create/Upload': 'Create/Upload',
+'created by': '作成者',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': 'crontab',
+'Current request': 'Current request',
+'Current response': 'Current response',
+'Current session': 'Current session',
+'currently running': '現在実行中',
+'currently saved or': '現在保存されているデータ　または',
+'data uploaded': 'data uploaded',
+'Database': 'Database',
+'Database %s select': 'Database %s select',
+'Database administration': 'Database administration',
+'database administration': 'データベース管理',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Date and Time': 'Date and Time',
+'db': 'db',
+'Debug': 'Debug',
+'defines tables': 'テーブル定義',
 'Delete': '削除',
+'delete': 'delete',
+'delete all checked': '選択したデータを全て削除',
+'delete plugin': 'プラグイン削除',
 'Delete this file (you will be asked to confirm deletion)': 'ファイルの削除（確認画面が出ます）',
+'Delete:': 'Delete:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
 'Deploy': 'デプロイ',
 'Deploy on Google App Engine': 'Google App Engineにデプロイ',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
+'design': 'デザイン',
 'Detailed traceback description': '詳細なトレースバック内容',
+'details': '詳細',
+'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
 'Disable': '無効',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'ドキュメント',
+'Docs': 'Docs',
+'done!': 'done!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
+'download layouts': 'レイアウトのダウンロード',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'プラグインのダウンロード',
+'Download plugins from repository': 'Download plugins from repository',
 'Edit': '編集',
+'edit all': '全て編集',
 'Edit application': 'アプリケーションを編集',
+'edit controller:': 'edit controller:',
+'Edit current record': 'Edit current record',
+'edit views:': 'ビューの編集:',
+'Editing %s': 'Editing %s',
 'Editing file "%s"': '"%s"ファイルを編集中',
+'Editing Language file': 'Editing Language file',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
 'Enable': '有効',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'Error': 'エラー',
 'Error logs for "%(app)s"': '"%(app)s"のエラーログ',
 'Error snapshot': 'エラー発生箇所',
 'Error ticket': 'エラーチケット',
 'Errors': 'エラー',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
 'Exception instance attributes': '例外インスタンス引数',
-'File': 'ファイル',
-'Frames': 'フレーム',
-'Functions with no doctests will result in [passed] tests.': 'doctestsのない関数は自動的にテストをパスします。',
-'Generate': 'アプリ生成',
-'Get from URL:': 'URLから取得:',
-'Help': 'ヘルプ',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'もし上記のレポートにチケット番号が含まれる場合は、doctestを実行する前に、コントローラの実行で問題があったことを示します。これはインデントの問題やその関数の外部で問題があった場合に起きるが一般的です。\n緑色のタイトルは全てのテスト（もし定義されていれば）をパスしたことを示します。その場合、テスト結果は表示されません。',
-'Install': 'インストール',
-'Installed applications': 'アプリケーション一覧',
-'Languages': '言語',
-'Last saved on:': '最終保存日時:',
-'License for': 'License for',
-'Login': 'ログイン',
-'Login to the Administrative Interface': '管理画面へログイン',
-'Logout': 'ログアウト',
-'Models': 'モデル',
-'Modules': 'モジュール',
-'NO': 'いいえ',
-'New Application Wizard': '新規アプリケーション作成ウィザード',
-'New application wizard': '新規アプリケーション作成ウィザード',
-'New simple application': '新規アプリケーション',
-'No databases in this application': 'このアプリケーションにはデータベースが存在しません',
-'Overwrite installed app': 'アプリケーションを上書き',
-'Pack all': 'パッケージ化',
-'Pack compiled': 'コンパイルデータのパッケージ化',
-'Peeking at file': 'ファイルを参照',
-'Plugin "%s" in application': '"%s"プラグイン',
-'Plugins': 'プラグイン',
-'Powered by': 'Powered by',
-'Reload routes': 'ルーティング再読み込み',
-'Remove compiled': 'コンパイルデータの削除',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "このファイルのテストを実行(全てのファイルに対して実行する場合は、'テスト'というボタンを使用できます)",
-'Save': '保存',
-'Saved file hash:': '保存されたファイルハッシュ:',
-'Site': 'サイト',
-'Sorry, could not find mercurial installed': 'インストールされているmercurialが見つかりません',
-'Start a new app': '新規アプリの作成',
-'Start wizard': 'ウィザードの開始',
-'Static files': '静的ファイル',
-'Step': 'ステップ',
-'Testing application': 'アプリケーションをテスト中',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'アプリケーションロジック、それぞれのURLパスはコントローラで公開されている各関数にマッピングされています',
-'The data representation, define database tables and sets': 'データの表示方法, テーブルとセットの定義',
-'The presentations layer, views are also known as templates': 'プレゼンテーション層、ビューはテンプレートとしても知られています',
-'There are no controllers': 'コントローラがありません',
-'There are no modules': 'モジュールがありません',
-'There are no plugins': 'プラグインはありません',
-'There are no translators, only default language is supported': '翻訳がないためデフォルト言語のみをサポートします',
-'There are no views': 'ビューがありません',
-'These files are served without processing, your images go here': 'これらのファイルは直接参照されます, ここに画像が入ります',
-'Ticket ID': 'チケットID',
-'To create a plugin, name a file/folder plugin_[name]': 'ファイル名/フォルダ名 plugin_[名称]としてプラグインを作成してください',
-'Traceback': 'トレースバック',
-'Translation strings for the application': 'アプリケーションの翻訳文字列',
-'Unable to download because:': '以下の理由でダウンロードできません:',
-'Uninstall': 'アプリ削除',
-'Upload a package:': 'パッケージをアップロード:',
-'Upload and install packed application': 'パッケージのアップロードとインストール',
-'Version': 'バージョン',
-'Versioning': 'バージョン管理',
-'Views': 'ビュー',
-'Web Framework': 'Web Framework',
-'YES': 'はい',
-'administrative interface': '管理画面',
-'and rename it:': 'ファイル名を変更:',
-'appadmin': 'アプリ管理画面',
-'application "%s" uninstalled': '"%s"アプリケーションが削除されました',
-'application compiled': 'アプリケーションがコンパイルされました',
-'arguments': '引数',
-'back': '戻る',
-'cache': 'cache',
-'cannot upload file "%(filename)s"': '"%(filename)s"ファイルをアップロードできません',
-'check all': '全てを選択',
-'code': 'コード',
-'collapse/expand all': '全て開閉する',
-'compiled application removed': 'コンパイル済みのアプリケーションが削除されました',
-'controllers': 'コントローラ',
-'create file with filename:': 'ファイル名:',
-'created by': '作成者',
-'crontab': 'crontab',
-'currently running': '現在実行中',
-'currently saved or': '現在保存されているデータ　または',
-'database administration': 'データベース管理',
-'db': 'db',
-'defines tables': 'テーブル定義',
-'delete all checked': '選択したデータを全て削除',
-'delete plugin': 'プラグイン削除',
-'design': 'デザイン',
-'details': '詳細',
-'direction: ltr': 'direction: ltr',
-'docs': 'ドキュメント',
-'download layouts': 'レイアウトのダウンロード',
-'download plugins': 'プラグインのダウンロード',
-'edit all': '全て編集',
-'edit views:': 'ビューの編集:',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
+'export as csv file': 'export as csv file',
+'Exports:': 'Exports:',
 'exposes': '公開',
 'exposes:': '公開:',
 'extends': '継承',
+'failed to compile file because:': 'failed to compile file because:',
+'failed to reload module because:': 'failed to reload module because:',
+'File': 'ファイル',
+'file "%(filename)s" created': 'file "%(filename)s" created',
+'file "%(filename)s" deleted': 'file "%(filename)s" deleted',
+'file "%(filename)s" uploaded': 'file "%(filename)s" uploaded',
+'file "%s" of %s restored': 'file "%s" of %s restored',
+'file changed on disk': 'file changed on disk',
+'file does not exist': 'file does not exist',
+'file not found': 'file not found',
+'file saved on %(time)s': 'file saved on %(time)s',
+'file saved on %s': 'file saved on %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
 'filter': 'フィルタ',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'Form has errors': 'Form has errors',
+'Frames': 'フレーム',
+'Functions with no doctests will result in [passed] tests.': 'doctestsのない関数は自動的にテストをパスします。',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'アプリ生成',
+'Get from URL:': 'URLから取得:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
 'go!': '実行!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Help': 'ヘルプ',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'もし上記のレポートにチケット番号が含まれる場合は、doctestを実行する前に、コントローラの実行で問題があったことを示します。これはインデントの問題やその関数の外部で問題があった場合に起きるが一般的です。\n緑色のタイトルは全てのテスト（もし定義されていれば）をパスしたことを示します。その場合、テスト結果は表示されません。',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'Import/Export',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'インクルード',
+'Indent with tabs': 'Indent with tabs',
 'index': 'index',
 'inspect attributes': '引数の検査',
+'Install': 'インストール',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': 'アプリケーション一覧',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
+'internal error': 'internal error',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'Internal State',
+'Invalid action': 'Invalid action',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid git repository specified.': 'Invalid git repository specified.',
+'invalid password': 'invalid password',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Invalid Query',
+'invalid request': 'invalid request',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
+'invalid ticket': 'invalid ticket',
+'Key': 'Key',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
+'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
+'Language files (static strings) updated': 'Language files (static strings) updated',
 'languages': '言語',
+'Languages': '言語',
+'Last Revision': 'Last Revision',
+'Last saved on:': '最終保存日時:',
+'License for': 'License for',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': 'ロードしています...',
+'Local Apps': 'Local Apps',
 'locals': 'ローカル',
+'Locals##debug': 'Locals##debug',
+'Login': 'ログイン',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': '管理画面へログイン',
+'Login/Register': 'Login/Register',
+'Logout': 'ログアウト',
+'lost password': 'lost password',
+'Main Menu': 'Main Menu',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
+'merge': 'merge',
+'Models': 'モデル',
 'models': 'モデル',
+'Modified On': 'Modified On',
+'Modules': 'モジュール',
 'modules': 'モジュール',
+'Multi User Mode': 'Multi User Mode',
+'new application "%s" created': 'new application "%s" created',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': '新規アプリケーション作成ウィザード',
+'New application wizard': '新規アプリケーション作成ウィザード',
 'new plugin installed': '新しいプラグインがインストールされました',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'New Record',
+'new record inserted': 'new record inserted',
+'New simple application': '新規アプリケーション',
+'next': 'next',
+'next %s rows': 'next %s rows',
+'NO': 'いいえ',
+'no changes': 'no changes',
+'No databases in this application': 'このアプリケーションにはデータベースが存在しません',
+'No Interaction yet': 'No Interaction yet',
+'no match': 'no match',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'オンラインデザイナー',
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
+'or import from csv file': 'or import from csv file',
+'Original/Translation': 'Original/Translation',
+'Overview': 'Overview',
+'Overwrite installed app': 'アプリケーションを上書き',
+'Pack all': 'パッケージ化',
+'Pack compiled': 'コンパイルデータのパッケージ化',
+'Pack custom': 'Pack custom',
 'pack plugin': 'プラグインのパッケージ化',
+'password changed': 'password changed',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'ファイルを参照',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': '"%(plugin)s"プラグインは削除されました',
+'Plugin "%s" in application': '"%s"プラグイン',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
 'plugins': 'プラグイン',
+'Plugins': 'プラグイン',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Powered by',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Query:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
+'record does not exist': 'record does not exist',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Reload routes': 'ルーティング再読み込み',
+'Remove compiled': 'コンパイルデータの削除',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
 'request': 'リクエスト',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Resolve Conflict file',
 'response': 'レスポンス',
 'restart': '最初からやり直し',
 'restore': '復元',
+'return': 'return',
+'Revert': 'Revert',
 'revert': '一つ前に戻す',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in Table': 'Rows in Table',
+'Rows selected': 'Rows selected',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "このファイルのテストを実行(全てのファイルに対して実行する場合は、'テスト'というボタンを使用できます)",
+'Running on %s': 'Running on %s',
+'Save': '保存',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': '保存されたファイルハッシュ:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'session': 'セッション',
 'session expired': 'セッションの有効期限が切れました',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': 'サイト',
+'Size of cache:': 'Size of cache:',
 'skip to generate': 'スキップしてアプリ生成画面へ移動',
+'some files could not be removed': 'some files could not be removed',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'インストールされているmercurialが見つかりません',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': '新規アプリの作成',
+'Start searching': 'Start searching',
+'Start wizard': 'ウィザードの開始',
 'state': 'state',
+'Static': 'Static',
 'static': '静的ファイル',
+'Static files': '静的ファイル',
+'Statistics': 'Statistics',
+'Step': 'ステップ',
+'step': 'step',
+'stop': 'stop',
+'submit': 'submit',
+'Submit': 'Submit',
+'successful': 'successful',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
+'Table': 'Table',
+'Temporary': 'Temporary',
 'test': 'テスト',
+'Testing application': 'アプリケーションをテスト中',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'アプリケーションロジック、それぞれのURLパスはコントローラで公開されている各関数にマッピングされています',
+'The data representation, define database tables and sets': 'データの表示方法, テーブルとセットの定義',
+'The presentations layer, views are also known as templates': 'プレゼンテーション層、ビューはテンプレートとしても知られています',
+'Theme': 'Theme',
+'There are no controllers': 'コントローラがありません',
+'There are no models': 'There are no models',
+'There are no modules': 'モジュールがありません',
+'There are no plugins': 'プラグインはありません',
+'There are no private files': 'There are no private files',
+'There are no static files': 'There are no static files',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': '翻訳がないためデフォルト言語のみをサポートします',
+'There are no views': 'ビューがありません',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'これらのファイルは直接参照されます, ここに画像が入ります',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Ticket',
+'Ticket ID': 'チケットID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'to  previous version.': '前のバージョンへ戻す。',
+'To create a plugin, name a file/folder plugin_[name]': 'ファイル名/フォルダ名 plugin_[名称]としてプラグインを作成してください',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'トレースバック',
+'Translation strings for the application': 'アプリケーションの翻訳文字列',
+'try something like': 'try something like',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Unable to check for upgrades',
+'unable to create application "%s"': 'unable to create application "%s"',
+'unable to delete file "%(filename)s"': 'unable to delete file "%(filename)s"',
+'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download app because:': 'Unable to download app because:',
+'Unable to download because:': '以下の理由でダウンロードできません:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
+'unable to parse csv file': 'unable to parse csv file',
+'unable to uninstall "%s"': 'unable to uninstall "%s"',
+'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': '全ての選択を解除',
+'Uninstall': 'アプリ削除',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
+'update': 'update',
 'update all languages': '全ての言語を更新',
+'Update:': 'Update:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
 'upload': 'アップロード',
+'Upload': 'Upload',
+'Upload a package:': 'パッケージをアップロード:',
+'Upload and install packed application': 'パッケージのアップロードとインストール',
 'upload file:': 'ファイルをアップロード:',
 'upload plugin file:': 'プラグインファイルをアップロード:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'user': 'ユーザー',
+'User': 'User',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': '変数',
+'Version': 'バージョン',
+'Versioning': 'バージョン管理',
+'Views': 'ビュー',
 'views': 'ビュー',
-'web2py Recent Tweets': '最近のweb2pyTweets',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2pyは最新です',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': '最近のweb2pyTweets',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'はい',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/my-mm.py

@@ -0,0 +1,660 @@
+# -*- coding: utf-8 -*-
+{
+'!langcode!': 'my-mm',
+'!langname!': 'မြန်မာ',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
+'%s %%{row} deleted': '%s %%{row} ဖျက်ပြီးပြီ',
+'%s %%{row} updated': '%s %%{row} ပြင်ပြီးပြီ',
+'%s selected': '%s ခု ရွေးထားသည်',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
+'(something like "it-it")': '(something like "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'Abort': 'Abort',
+'About': 'အကြောင်း',
+'About application': 'About application',
+'Accept Terms': 'Accept Terms',
+'Access Control': 'အသုံးပြု ခြင်းဆိုင်ရာ ထိန်းချုပ်ရန်',
+'Add breakpoint': 'Add breakpoint',
+'Additional code for your application': 'Additional code for your application',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': 'admin disabled because no admin password',
+'admin disabled because not supported on google app engine': 'admin disabled because not supported on google app engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': 'admin disabled because unable to access password file',
+'Admin is disabled because insecure channel': 'Admin is disabled because insecure channel',
+'Admin language': 'Admin language',
+'Admin versioning page': 'Admin versioning page',
+'Administrative Interface': 'စီမံခန့်ခွဲရာ အင်တာဖေ့စ်',
+'administrative interface': 'administrative interface',
+'Administrator Password:': 'Administrator Password:',
+'Ajax Recipes': 'Ajax Recipes',
+'and rename it:': 'and rename it:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'စိတ်မချရသော လမ်းကြောင်းမှ ဝင်ရောက်သဖြင့် appadmin ကို အသုံးပြု၍ မရပါ',
+'Application': 'Application',
+'application "%s" uninstalled': 'application "%s" uninstalled',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'application compiled',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
+'Application name:': 'Application name:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'အသုံးမပြုပါ',
+'are not used yet': 'အသုံးမပြုသေးပါ',
+'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
+'Are you sure you want to delete this object?': 'သင် ဒီအရာ ဖျက်ရန် သေချာပါသလား။',
+'Are you sure you want to uninstall application "%s"?': 'Are you sure you want to uninstall application "%s"?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'ATTENTION: you cannot edit the running application!': 'ATTENTION: you cannot edit the running application!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
+'Available Databases and Tables': 'အသုံးပြုနိုင်သော ဒေတာဘေစ့်များနှင့် ဇယားများ',
+'back': 'back',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Buy this book': 'ဒီစာအုပ်ကို ဝယ်ပါ',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'cache, errors and sessions cleaned',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
+'Cannot be empty': 'အလွတ် မဖြစ်ရပါ',
+'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
+'cannot create file': 'cannot create file',
+'cannot upload file "%(filename)s"': 'cannot upload file "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
+'Change admin password': 'Change admin password',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
+'check all': 'check all',
+'Check for upgrades': 'Check for upgrades',
+'Check to delete': 'ဖျက်ရန် စစ်ဆေးပါ',
+'Checking for upgrades...': 'အဆင့်မြှင့်တင်မှုများအတွက် စစ်ဆေးနေသည် ...',
+'Clean': 'ရှင်းလင်းရန်',
+'Clear': 'Clear',
+'Clear CACHE?': 'CACHE ကို ရှင်းလင်းမည်မှာ ဟုတ်ပါသလား။',
+'Clear DISK': 'DISK ကို ရှင်းလင်းမည်။',
+'Clear RAM': 'RAM ကို ရှင်းလင်းမည်။',
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
+'Client IP': 'Client IP',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'collapse/expand all',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
+'Community': 'အသိုင်းအဝိုင်း',
+'Compile': 'Compile',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'compiled application removed',
+'Components and Plugins': 'Components and Plugins',
+'Condition': 'Condition',
+'continue': 'continue',
+'Controller': 'ကွန်ထရိုလာ',
+'Controllers': 'ကွန်ထရိုလာများ',
+'controllers': 'controllers',
+'Copyright': 'မူပိုင်ခွင့်',
+'Count': 'Count',
+'Create': 'ဖန်တီးရန်',
+'create file with filename:': 'create file with filename:',
+'Create/Upload': 'Create/Upload',
+'created by': 'ဖန်းတီးသူ',
+'Created By': 'ပြုလုပ်ဖန်တီးသူ',
+'Created by:': 'Created by:',
+'Created On': 'ပြုလုပ်ဖန်တီးသည့်အချိန်',
+'Created on:': 'Created on:',
+'crontab': 'crontab',
+'Current request': 'Current request',
+'Current response': 'Current response',
+'Current session': 'Current session',
+'currently running': 'လက်ရှိတွင် လုပ်ဆောင်နေသည်',
+'currently saved or': 'currently saved or',
+'data uploaded': 'data uploaded',
+'Database': 'ဒေတာဘေစ့်',
+'Database %s select': 'Database %s select',
+'Database administration': 'Database administration',
+'database administration': 'ဒေတာဘေ့(စ်) စီမံခန့်ခွဲခြင်း',
+'Database Administration (appadmin)': 'ဒေတာဘေစ့် စီမံခန့်ခွဲခြင်း (appadmin)',
+'Date and Time': 'Date and Time',
+'db': 'db',
+'DB Model': 'DB Model',
+'Debug': 'အမှားရှာရန်',
+'defines tables': 'defines tables',
+'Delete': 'Delete',
+'delete': 'delete',
+'delete all checked': 'delete all checked',
+'delete plugin': 'delete plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'Delete:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'အစမ်း၊ သရုပ်ပြမှုများ',
+'Deploy': 'Deploy',
+'Deploy on Google App Engine': 'Deploy on Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Deployment Recipes': 'Deployment Recipes',
+'Description': 'ဖော်ပြချက်',
+'Description:': 'Description:',
+'design': 'design',
+'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
+'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
+'Disable': 'ပိတ်ရန်',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk ရှင်းလင်းပြီးပြီ',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
+'Documentation': 'စာရွက်စာတမ်း အထောက်အကူများ',
+"Don't know what to do?": 'ဘာလုပ်ရမည်မသိ ဖြစ်နေပါသလား။',
+'done!': 'လုပ်ငန်း ဆောင်ရွက်ပြီးပြီ!',
+'Downgrade': 'Downgrade',
+'Download': 'Download',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
+'download layouts': 'download layouts',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'download plugins',
+'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'အီးမေးလ်',
+'Edit': 'ပြင်ဆင်ရန်',
+'edit all': 'edit all',
+'Edit application': 'Application ကို ပြင်ရန်',
+'edit controller:': 'edit controller:',
+'Edit current record': 'လက်ရှိ မှတ်တမ်းကို ပြင်ရန်',
+'edit views:': 'edit views:',
+'Editing %s': 'Editing %s',
+'Editing Language file': 'Editing Language file',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Email and SMS': 'အီးမေးလ်နှင့် SMS',
+'Enable': 'ဖွင့်ရန်',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
+'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
+'Error': 'Error',
+'Error logs for "%(app)s"': 'Error logs for "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'အမှားများ',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Exception instance attributes',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
+'export as csv file': ' csv file အနေနဲ့ ထုတ်ပေးရန်',
+'Exports:': 'Exports:',
+'exposes': 'exposes',
+'exposes:': 'exposes:',
+'extends': 'extends',
+'failed to compile file because:': 'failed to compile file because:',
+'failed to reload module because:': 'failed to reload module because:',
+'FAQ': 'ဖြစ်လေ့ရှိသော ပြဿနာများ',
+'File': 'File',
+'file "%(filename)s" created': 'file "%(filename)s" created',
+'file "%(filename)s" deleted': 'file "%(filename)s" deleted',
+'file "%(filename)s" uploaded': 'file "%(filename)s" uploaded',
+'file "%s" of %s restored': 'file "%s" of %s restored',
+'file changed on disk': 'file changed on disk',
+'file does not exist': 'file does not exist',
+'file not found': 'file not found',
+'file saved on %(time)s': 'file saved on %(time)s',
+'file saved on %s': 'file saved on %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
+'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'First name': 'အမည်၏ ပထမဆုံး စာလုံး',
+'Form has errors': 'Form has errors',
+'Forms and Validators': 'Forms and Validators',
+'Frames': 'Frames',
+'Free Applications': 'အခမဲ့ Applications',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Group ID': 'Group ID',
+'Groups': 'အဖွဲ့များ',
+'Hello World': 'မင်္ဂလာပါ ကမ္ဘာကြီး။',
+'Help': 'အကူအညီ',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'မူလသို့',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
+'How did you get here?': 'သင် ဘယ်လို ရောက်လာခဲ့သလဲ။',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'သွင်းယူရန်',
+'Import/Export': 'သွင်းယူရန်/ထုတ်ယူရန်',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
+'includes': 'includes',
+'Indent with tabs': 'Indent with tabs',
+'inspect attributes': 'inspect attributes',
+'Install': 'Install',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': 'ထည့်သွင်းပြီး application များ',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
+'internal error': 'internal error',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'Internal State',
+'Introduction': 'မိတ်ဆက်',
+'Invalid action': 'Invalid action',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'အီးမေးလ် ဖြည့်သွင်းမှုမှားနေသည်',
+'Invalid git repository specified.': 'Invalid git repository specified.',
+'invalid password': 'invalid password',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Invalid Query',
+'invalid request': 'invalid request',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
+'invalid ticket': 'invalid ticket',
+'Is Active': 'Is Active',
+'Key': 'Key',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
+'Language': 'ဘာသာစကား',
+'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
+'Language files (static strings) updated': 'Language files (static strings) updated',
+'languages': 'ဘာသာစကားများ',
+'Languages': 'ဘာသာစကားများ',
+'Last name': 'မျိုးနွယ်အမည်',
+'Last Revision': 'Last Revision',
+'Last saved on:': 'Last saved on:',
+'Layout': 'အပြင်အဆင်',
+'Layout Plugins': 'Layout Plugins',
+'Layouts': 'အပြင်အဆင်များ',
+'License for': 'License for',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Live Chat': 'တိုက်ရိုက် ဆက်သွယ် ပြောကြားရန်',
+'Loading...': 'Loading...',
+'Local Apps': 'Local Apps',
+'locals': 'locals',
+'Locals##debug': 'Locals##debug',
+'Login': 'ဝင်ရောက်အသုံးပြုရန်',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'Login to the Administrative Interface',
+'Login/Register': 'Login/Register',
+'Logout': 'ထွက်ရန်',
+'Lost Password': 'စကားဝှက် မသိတော့ပါ',
+'lost password': 'lost password',
+'Lost password?': 'စကားဝှက် မသိတော့ဘူးလား။',
+'Main Menu': 'Main Menu',
+'Manage': 'စီမံခန့်ခွဲရန်',
+'Manage %(action)s': '%(action)s ကို စီမံရန်',
+'Manage Access Control': 'အသုံးပြုခြင်းဆိုင်ရာ ထိန်းချုပ်မှု စီမံခန့်ခွဲရန်',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'အသင်းဝင်များ',
+'Menu Model': 'Menu Model',
+'merge': 'merge',
+'Models': 'Models',
+'models': 'models',
+'Modified By': 'ပြင်ဆင်မွမ်းမံသူ',
+'Modified On': 'ပြင်ဆင်မွမ်းမံသည့် အချိန်',
+'Modules': 'Modules',
+'modules': 'modules',
+'Multi User Mode': 'Multi User Mode',
+'My Sites': 'ကျွန်ုပ်၏ Site များ',
+'Name': 'အမည်',
+'new application "%s" created': 'new application "%s" created',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
+'New application wizard': 'New application wizard',
+'new plugin installed': 'new plugin installed',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'မှတ်တမ်း အသစ်',
+'new record inserted': 'မှတ်တမ်း အသစ် ဖြည့်သွင်းပြီးပြီ',
+'New simple application': 'ရိုးရိုး application အသစ်',
+'next': 'next',
+'next %s rows': 'နောက်အတန်း %s တန်း',
+'NO': 'NO',
+'no changes': 'no changes',
+'No databases in this application': 'ဒီ application တွင် မည်သည့် ဒေတာဘေစ့်မှ မရှိပါ',
+'No Interaction yet': 'No Interaction yet',
+'no match': 'no match',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Online examples': 'အွန်လိုင်း နမူနာများ',
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
+'or import from csv file': 'or import from csv file',
+'Origin': 'မူလ အစ',
+'Original/Translation': 'Original/Translation',
+'Other Plugins': 'အခြား Plugins',
+'Other Recipes': 'အခြား Recipes',
+'Overview': 'အပေါ်ယံရှုမြင်ခြင်း',
+'Overwrite installed app': 'Overwrite installed app',
+'Pack all': 'အားလုံးကို ထုပ်ပိုးရန်',
+'Pack compiled': 'Pack compiled',
+'Pack custom': 'ရွေးချယ်ထုပ်ပိုးရန်',
+'pack plugin': 'pack plugin',
+'Password': 'စကားဝှက်',
+'password changed': 'password changed',
+"Password fields don't match": 'စကားဝှက်များ ကိုက်ညီမှု မရှိပါ',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Peeking at file',
+'Permission': 'ခွင့်ပြုချက်',
+'Permissions': 'ခွင့်ပြုချက်များ',
+'Please': 'Please',
+'please input your password again': 'ကျေးဇူးပြု၍ စကားဝှက်ကို ထပ်မံ ဖြည့်သွင်းပေးပါ',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
+'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
+'Plugin "%s" in application': 'Plugin "%s" in application',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
+'plugins': 'plugins',
+'Plugins': 'Plugins',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'အားဖြည့်စွမ်းအားပေးသူ',
+'Preface': 'နိဒါန်း',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library ကို မတွေ့ပါ',
+'Python': 'Python',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Query:',
+'Quick Examples': 'အမြန် အသုံးပြုနိုင်သော နမူနာများ',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram ရှင်းလင်းပြီးပြီ',
+'Rapid Search': 'Rapid Search',
+'Recipes': 'Recipes',
+'Record': 'မှတ်တမ်း',
+'record does not exist': 'မှတ်တမ်း မရှိပါ',
+'Record ID': 'Record ID',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Register': 'မှတ်ပုံတင်ရန်',
+'Registration identifier': 'Registration identifier',
+'Registration key': 'Registration key',
+'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
+'Remove compiled': 'Remove compiled',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
+'request': 'request',
+'Request reset password': 'စကားဝှက် အသစ် တောင်းဆိုရန်',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
+'Resolve Conflict file': 'Resolve Conflict file',
+'response': 'response',
+'restart': 'restart',
+'restore': 'restore',
+'return': 'return',
+'Revert': 'Revert',
+'revert': 'revert',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in Table': 'Rows in Table',
+'Rows selected': 'ရွေးထားသော အတန်းများ',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Running on %s',
+'Save': 'Save',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Saved file hash:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
+'Semantic': 'Semantic',
+'Services': 'Services',
+'session': 'session',
+'session expired': 'session expired',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
+'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': 'Site',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
+'some files could not be removed': 'some files could not be removed',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Start searching',
+'Start wizard': 'Start wizard',
+'state': 'state',
+'Static': 'Static',
+'static': 'static',
+'Static files': 'Static files',
+'Statistics': 'ကိန်းဂဏန်း အချက်အလက်များ',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
+'Stylesheet': 'Stylesheet',
+'submit': 'ပြုလုပ်ပါ',
+'Submit': 'Submit',
+'successful': 'successful',
+'Support': 'အထောက်အပံ့',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
+'Table': 'ဇယား',
+'Temporary': 'Temporary',
+'test': 'test',
+'Testing application': 'Testing application',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
+'The Core': 'The Core',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The output of the file is a dictionary that was rendered by the view %s': 'The output of the file is a dictionary that was rendered by the view %s',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
+'The Views': 'The Views',
+'Theme': 'Theme',
+'There are no controllers': 'There are no controllers',
+'There are no models': 'There are no models',
+'There are no modules': 'There are no modules',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': 'There are no static files',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'There are no views',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
+'This App': 'ဒီ App',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'ဒီအီးမေးလ်တွင် အကောင့် ရှိပြီး ဖြစ်ပါသည်',
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Ticket',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
+'to  previous version.': 'to  previous version.',
+'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
+'Translation strings for the application': 'Translation strings for the application',
+'try something like': 'try something like',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Twitter': 'Twitter',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Unable to check for upgrades',
+'unable to create application "%s"': 'unable to create application "%s"',
+'unable to delete file "%(filename)s"': 'unable to delete file "%(filename)s"',
+'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download app because:': 'Unable to download app because:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
+'unable to parse csv file': 'unable to parse csv file',
+'unable to uninstall "%s"': 'unable to uninstall "%s"',
+'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
+'uncheck all': 'uncheck all',
+'Uninstall': 'Uninstall',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
+'update': 'update',
+'update all languages': 'update all languages',
+'Update:': 'Update:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
+'upload': 'upload',
+'Upload': 'Upload',
+'Upload a package:': 'Upload a package:',
+'Upload and install packed application': 'Upload and install packed application',
+'upload file:': 'upload file:',
+'upload plugin file:': 'upload plugin file:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
+'User': 'အသုံးပြုသူ',
+'User ID': 'User ID',
+'Username': 'Username',
+'Users': 'အသုံးပြုသူများ',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
+'variables': 'variables',
+'Verify Password': 'စကားဝှက်ကို အတည်ပြုပါ',
+'Version': 'Version',
+'Versioning': 'Versioning',
+'Videos': 'ဗွီဒီယိုများ',
+'View': 'ဗျူး',
+'Views': 'ဗျူးများ',
+'views': 'views',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
+'web2py is up to date': 'web2py is up to date',
+'web2py online debugger': 'web2py online debugger',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome': 'ကြိုဆိုပါ၏',
+'Welcome to web2py!': 'web2py မှ ကြိုဆိုပါသည်။',
+'Which called the function %s located in the file %s': 'Which called the function %s located in the file %s',
+'Working...': 'ဆောင်ရွက်နေပါသည် ။ ။ ။',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'YES',
+'Yes': 'Yes',
+'You are successfully running web2py': 'သင်သည် web2py ကို အောင်မြင်စွာ လည်ပတ်မောင်းနှင်စေပါသည်။',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You can modify this application and adapt it to your needs': 'သင် ဒီ application ကို ပြုပြင်မွမ်းမံနိုင်ပါသည်။ ထို့အပြင် သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီစေရန် ပြုလုပ်နိုင်ပါသည်။',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'You visited the url %s': 'သင် လည်ပတ်ခဲ့သော URL %s',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'စကားဝှက် အသစ် တောင်းဆိုရန်': 'စကားဝှက် အသစ် တောင်းဆိုရန်',
+'မှတ်ပုံတင်ရန်': 'မှတ်ပုံတင်ရန်',
+'ဝင်ရောက်အသုံးပြုရန်': 'ဝင်ရောက်အသုံးပြုရန်',
+}

applications/admin/languages/nl.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'nl',
 '!langname!': 'Nederlands',
@@ -9,42 +9,54 @@
 '%s %%{row} deleted': '%s %%{row} verwijderd',
 '%s %%{row} updated': '%s %%{row} geupdate',
 '%s Recent Tweets': '%s Recente Tweets',
+'%s selected': '%s selected',
 '%s students registered': '%s studenten geregistreerd',
 '%Y-%m-%d': '%Y/%m/%d',
 '%Y-%m-%d %H:%M:%S': '%Y/%m/%d %H:%M:%S',
 '(requires internet access)': '(vereist internettoegang)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(zoiets als "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01Searching: **%s** %%{file}': '@markmin: zoeken: **%s** %%{file}',
 'Abort': 'Afbreken',
 'About': 'Over',
 'about': 'over',
 'About application': 'Over applicatie',
+'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Voeg breakpoint toe',
 'Additional code for your application': 'Additionele code voor je applicatie',
+'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'admin uitgezet omdat er geen admin wachtwoord is',
 'admin disabled because not supported on google app engine': 'admin uitgezet omdat dit niet ondersteund wordt op google app engine',
 'admin disabled because too many invalid login attempts': 'admin is uitgezet omdat er te veel ongeldige login attempts zijn geweest',
 'admin disabled because unable to access password file': 'admin is uitgezet omdat er geen toegang was tot het wachtwoordbestand',
 'Admin is disabled because insecure channel': 'Admin is uitgezet vanwege onveilig kanaal',
 'Admin language': 'Admintaal',
+'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'administratieve interface',
 'Administrator Password:': 'Administrator Wachtwoord:',
 'and rename it:': 'en hernoem het:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'App does not exist or your are not authorized': 'App bestaat niet of je bent niet geautoriseerd',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'appadmin is uitgezet vanwege een onveilig kanaal',
+'Application': 'Application',
 'application "%s" uninstalled': 'applicatie "%s" gedeïnstalleerd',
 'application %(appname)s installed with md5sum: %(digest)s': 'applicatie %(appname)s geïnstalleerd met md5sum: %(digest)s',
 'Application cannot be generated in demo mode': 'Applicatie kan niet gegenereerd worden in demo-mode',
 'application compiled': 'applicatie gecompileerd',
+'Application exists already': 'Application exists already',
 'application is compiled and cannot be designed': 'applicatie is gecompileerd en kan niet worden ontworpen',
 'Application name:': 'Applicatienaam:',
+'Application updated via git pull': 'Application updated via git pull',
 'are not used': 'worden niet gebruikt',
 'are not used yet': 'worden nog niet gebruikt',
 'Are you sure you want to delete file "%s"?': 'Weet je zeker dat je bestand "%s" wilt verwijderen?',
 'Are you sure you want to delete plugin "%s"?': 'Weet je zeker dat je plugin "%s"? wilt verwijderen?',
 'Are you sure you want to delete this object?': 'Weet je zeker dat je dit object wilt verwijderen?',
 'Are you sure you want to uninstall application "%s"?': 'Weet je zeker dat je applicatie "%s" wilt deïnstalleren?',
+'Are you sure?': 'Are you sure?',
 'arguments': 'argumenten',
 'at char %s': 'bij karakter %s',
 'at line %s': 'op regel  %s',
@@ -52,8 +64,12 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'LET OP: Login heeft beveiligde (HTTPS) verbinding nodig of moet draaien op localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'LET OP: TESTEN IS NIET THREAD SAFE EN PROBEER NIET MEERDERE TESTEN TEGELIJK TE DOEN.',
 'ATTENTION: you cannot edit the running application!': 'LET OP: je kan de draaiende applicatie niet bewerken!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Beschikbare databases en tabellen',
+'Available Databases and Tables': 'Available Databases and Tables',
 'back': 'terug',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
 'bad_resource': 'slechte_resource',
 'Basics': 'Basics',
 'Begin': 'Begin',
@@ -62,7 +78,9 @@
 'breakpoints': 'breakpoints',
 'Bulk Register': 'Bulk Registreer',
 'Bulk Student Registration': 'Bulk Studentenregistratie',
+'Cache': 'Cache',
 'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
 'Cache Keys': 'Cache Keys',
 'cache, errors and sessions cleaned': 'cache, errors en sessies geleegd',
 'can be a git repo': 'can een git repo zijn',
@@ -71,12 +89,16 @@
 'Cannot compile: there are errors in your app:': 'Kan niet compileren: er bevinden zich fouten in je app:',
 'cannot create file': 'kan bestand niet maken',
 'cannot upload file "%(filename)s"': 'kan bestand "%(filename)s" niet uploaden',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Verander admin wachtwoord',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
 'check all': 'vink alles aan',
 'Check for upgrades': 'Controleer voor upgrades',
 'Check to delete': 'Vink aan om te verwijderen',
 'Checking for upgrades...': 'Controleren voor upgrades...',
 'Clean': 'Clean',
+'Clear': 'Clear',
 'Clear CACHE?': 'Leeg CACHE?',
 'Clear DISK': 'Leeg DISK',
 'Clear RAM': 'Leeg RAM',
@@ -86,8 +108,13 @@
 'Code listing': 'Code listing',
 'collapse/expand all': 'klap in/klap alles uit',
 'Command': 'Commando',
+'Comment:': 'Comment:',
 'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'Compileer',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'Gecompileerde applicatie verwijderd',
 'Condition': 'Conditie',
 'contact_admin': 'contact_admin',
@@ -100,8 +127,11 @@
 'create file with filename:': 'maak bestand met naam:',
 'create plural-form': 'maak meervoudsvorm',
 'Create rules': 'Maak regels',
+'Create/Upload': 'Create/Upload',
 'created by': 'gemaakt door:',
+'Created by:': 'Created by:',
 'Created On': 'Gemaakt Op',
+'Created on:': 'Created on:',
 'crontab': 'crontab',
 'Current request': 'Huidige request',
 'Current response': 'Huidige response',
@@ -109,9 +139,13 @@
 'currently running': 'draait op het moment',
 'currently saved or': 'op het moment opgeslagen of',
 'data uploaded': 'data geupload',
+'Database': 'Database',
 'database': 'database',
+'Database %s select': 'Database %s select',
 'database %s select': 'database %s select',
+'Database administration': 'Database administration',
 'database administration': 'database administratie',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Datum en Tijd',
 'db': 'db',
 'Debug': 'Debug',
@@ -123,10 +157,15 @@
 'Delete this file (you will be asked to confirm deletion)': 'Verwijder dit bestand (je zal worden gevraagd om de verwijdering te bevestigen)',
 'Delete:': 'Verwijder:',
 'deleted after first hit': 'verwijder na eerste hit',
+'Demo': 'Demo',
 'Deploy': 'Deploy',
 'Deploy on Google App Engine': 'Deploy op Google App Engine (GAE)',
 'Deploy to OpenShift': 'Deploy op OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deploymentformulier',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
 'design': 'design',
 'Detailed traceback description': 'Gedetailleerde traceback beschrijving',
 'details': 'details',
@@ -135,24 +174,39 @@
 'Disable': 'Zet uit',
 'Disabled': 'Uitgezet',
 'disabled in demo mode': 'uitgezet in demo-modus',
+'disabled in GAE mode': 'disabled in GAE mode',
 'disabled in multi user mode': 'uitgezet in multi-usermodus',
+'DISK': 'DISK',
 'Disk Cache Keys': 'Disk Cache Keys',
 'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'docs',
+'Docs': 'Docs',
 'done!': 'gereed!',
 'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
 'download layouts': 'download layouts',
+'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
+'Download plugins from repository': 'Download plugins from repository',
 'Edit': 'Bewerk',
 'edit all': 'bewerk alles',
 'Edit application': 'Bewerk applicatie',
 'edit controller': 'bewerk controller',
+'edit controller:': 'edit controller:',
 'Edit current record': 'Bewerk huidige record',
 'edit views:': 'bewerk views:',
+'Editing %s': 'Editing %s',
 'Editing file "%s"': 'Bewerk bestand "%s"',
 'Editing Language file': 'Taalbestand aan het bewerken',
 'Editing Plural Forms File': 'Meervoudsvormenbestand aan het bewerken',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
 'Enable': 'Zet aan',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'enter a value': 'geef een waarde',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Error logs voor "%(app)s"',
@@ -162,8 +216,11 @@
 'Exception %(extype)s: %(exvalue)s': 'Exceptie %(extype)s: %(exvalue)s',
 'Exception %s': 'Exceptie %s',
 'Exception instance attributes': 'Exceptie instantie attributen',
+'Exit Fullscreen': 'Exit Fullscreen',
 'Expand Abbreviation': 'Klap Afkorting uit',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'exporteer als csv-bestand',
+'Exports:': 'Exports:',
 'exposes': 'stelt bloot',
 'exposes:': 'stelt bloot:',
 'extends': 'extends',
@@ -180,8 +237,13 @@
 'file not found': 'bestand niet gevonden',
 'file saved on %(time)s': 'bestand opgeslagen op %(time)s',
 'file saved on %s': 'bestand bewaard op %s',
+'filename': 'filename',
 'Filename': 'Bestandsnaam',
+'Files added': 'Files added',
 'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'Form has errors': 'Form has errors',
 'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'Functies zonder doctests zullen resulteren in [passed] tests.',
 'GAE Email': 'GAE Email',
@@ -197,22 +259,31 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Ga naar',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
 'Help': 'Help',
+'here': 'here',
 'Hide/Show Translated strings': 'Verberg/Toon Vertaalde strings',
+'Highlight current line': 'Highlight current line',
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'wordt alleen gerespecteerd als expressie waar is',
 'If start the downgrade, be patient, it may take a while to rollback': 'Wees geduldig na het starten van de downgrade, het kan een tijd duren om de rollback uit te voeren',
 'If start the upgrade, be patient, it may take a while to download': 'Wees geduldig na het starten van de upgrade, het kan een tijd duren om de download te voltooien',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Als de bovenstaande report een ticketnummer bevat indiceert dit een fout in het uitvoeren van de controller, nog voor een poging wordt gedaan om de doctests uit te voeren. Dit wordt meestal veroorzaak door een inspringfout of een fout buiten de functie-code. Een groene titel indiceert dat alle tests (wanneer gedefinieerd) geslaagd zijn. In dit geval worden testresultaten niet getoond.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
 'Import/Export': 'Import/Export',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'Binnen ontwikkeling, gebruik de default Rocket webserver die op het moment ondersteund wordt door deze debugger.',
 'includes': 'includes',
+'Indent with tabs': 'Indent with tabs',
 'index': 'index',
 'insert new': 'insert new',
 'insert new %s': 'insert new %s',
 'inspect attributes': 'inspecteer attributen',
 'Install': 'Install',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Geïnstalleerde applicaties',
 'Interaction at %s line %s': 'Interactie op %s regel %s',
 'Interactive console': 'Interactieve console',
@@ -220,38 +291,57 @@
 'internal error: %s': 'interne error: %s',
 'Internal State': 'Interne State',
 'Invalid action': 'Ongeldige actie',
+'Invalid application name': 'Invalid application name',
 'invalid circual reference': 'ongeldige cirkelreferentie',
 'invalid circular reference': 'Ongeldige circulaire referentie',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'ongeldig wachtwoord',
 'invalid password.': 'ongeldig wachtwoord.',
 'Invalid Query': 'Ongeldige Query',
 'invalid request': 'ongeldige request',
+'Invalid request': 'Invalid request',
 'invalid request ': 'ongeldige request',
 'invalid table names (auth_* tables already defined)': 'ongeldige tabelnamen (auth_* tabellen zijn al gedefinieerd)',
 'invalid ticket': 'ongeldige ticket',
 'Key': 'Key',
 'Key bindings': 'Key bindings',
 'Key bindings for ZenCoding Plugin': 'Key bindings voor ZenCoding Plugin',
+'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill proces',
 'language file "%(filename)s" created/updated': 'taalbestand "%(filename)s" gemaakt/geupdate',
 'Language files (static strings) updated': 'Taalbestanden (statische strings) geupdate',
 'languages': 'talen',
 'Languages': 'Talen',
+'Last Revision': 'Last Revision',
 'Last saved on:': 'Laatst opgeslagen op:',
 'License for': 'Licentie voor',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
 'Line number': 'Regelnummer',
 'LineNo': 'RegelNr',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': 'laden...',
+'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
 'Login': 'Login',
 'login': 'Login',
+'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Login op de Administratieve Interface',
+'Login/Register': 'Login/Register',
 'Logout': 'Logout',
+'lost password': 'lost password',
 'Main Menu': 'Hoofdmenu',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
 'Manage Admin Users/Students': 'Beheer Admin Gebruikers/Studenten',
+'Manage Cache': 'Manage Cache',
 'Manage Students': 'Beheer Studenten',
 'Match Pair': 'Match Pair',
+'Memberships': 'Memberships',
 'merge': 'samenvoegen',
 'Merge Lines': 'Voeg Regels Samen',
 'Minimum length is %s': 'Minimale lengte is %s',
@@ -260,72 +350,108 @@
 'Modified On': 'Verandert Op',
 'Modules': 'Modules',
 'modules': 'modules',
+'Multi User Mode': 'Multi User Mode',
 'Must include at least %s %s': 'Moet ten minste bevatten %s %s',
-'Must include at least %s lower case': 'Moet ten minste bevatten %s lower case',
+'Must include at least %s lowercase': 'Moet ten minste bevatten %s kleine letter',
 'Must include at least %s of the following : %s': 'Moet ten minste bevatten %s van het volgende : %s',
-'Must include at least %s upper case': 'Moet ten minste bevatten %s upper case',
+'Must include at least %s uppercase': 'Moet ten minste bevatten %s hoofdletter',
 'new application "%s" created': 'nieuwe applicatie "%s" gemaakt',
+'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'Nieuwe Applicatie Wizard',
 'New application wizard': 'Nieuwe applicatie wizard',
 'new plugin installed': 'nieuwe plugin geïnstalleerd',
+'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Nieuw Record',
 'new record inserted': 'nieuw record ingevoegd',
 'New simple application': 'Nieuwe eenvoudige applicatie',
 'next': 'volgende',
+'next %s rows': 'next %s rows',
 'next 100 rows': 'volgende 100 rijen',
 'Next Edit Point': 'Volgende Bewerkpunt',
 'NO': 'NEE',
+'no changes': 'no changes',
 'No databases in this application': 'Geen databases in deze applicatie',
 'No Interaction yet': 'Nog geen interactie',
 'no match': 'geen match',
+'no package selected': 'no package selected',
 'no permission to uninstall "%s"': 'geen permissie om "%s" te deïnstalleren',
 'No ticket_storage.txt found under /private folder': 'Geen ticket_storage.txt gevonden onder /private directory',
+'Node:': 'Node:',
 'Not Authorized': 'Geen Rechten',
+'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Notitie: Bij een Github error status code 128, zorg ervoor dat het systeem en het account dat je aan het deployen bent een correspondeerde ssh key geconfigureerd heeft in het openshift account. ',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": 'Om op productie deze debugger te gebruiken, moet je webserver configureren om een proces en meerdere threads te gebruiken.',
 'online designer': 'online designer',
+'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
 'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'of importeer van csv-bestand',
 'Original/Translation': 'Oorspronkelijk/Vertaling',
+'Overview': 'Overview',
 'Overwrite installed app': 'Overschrijf geïnstalleerde app',
 'Pack all': 'Pack all',
 'Pack compiled': 'Pack compiled',
+'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
 'PAM authenticated user, cannot change password here': 'PAM geauthenticeerde gebruiker, kan wachtwoord hier niet wijzigen',
 'password changed': 'wachtwoord gewijzigd',
+'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Pad naar appcfg.py',
 'Path to local openshift repo root.': 'Pad naar lokale openshift repo root.',
 'peek': 'gluur',
 'Peeking at file': 'Gluren naar bestand',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
 'Please': 'Alstublieft',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin': 'plugin',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" gedetecteerd',
 'Plugin "%s" in application': 'Plugin "%s" in applicatie',
 'plugin not specified': 'plugin niet gespecialiseerd',
+'Plugin page': 'Plugin page',
 'plugins': 'plugins',
 'Plugins': 'Plugins',
 'Plural Form #%s': 'Meervoudsvorm #%s',
 'Plural-Forms:': 'Meervoudsvormen',
 'Powered by': 'Powered by',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': 'vorige 100 rijen',
 'Previous Edit Point': 'Vorige Bewerkpunt',
 'Private files': 'Privébestanden',
 'private files': 'privébestanden',
 'Project Progress': 'Projectvoortgang',
 'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
 'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
 'Query:': 'Query:',
+'RAM': 'RAM',
 'RAM Cache Keys': 'RAM Cache Keys',
 'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
 'record': 'record',
 'record does not exist': 'record bestaat niet',
 'record id': 'record id',
+'Record id': 'Record id',
 'refresh': 'ververs',
+'register': 'register',
 'Reload routes': 'Herlaadt routes',
 'Remove compiled': 'Verwijder gecompileerde',
 'Removed Breakpoint on %s at line %s': 'Verwijder Breakpoint op %s op regel %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'vereist python-git, maar niet geïnstalleerd',
 'resolve': 'oplossen',
 'Resolve Conflict file': 'Los Conflictbestand op',
@@ -333,7 +459,14 @@
 'restart': 'herstart',
 'restore': 'herstel',
 'return': 'keer terug',
+'Revert': 'Revert',
 'revert': 'herstel',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in Table': 'Rows in Table',
 'Rows in table': 'Rijen in tabel',
 'Rows selected': 'Rijen geselecteerd',
 'rules are not defined': 'regels zijn niet gedefinieerd',
@@ -345,34 +478,54 @@
 'Running on %s': 'Draait op %s',
 'runonce': 'runonce',
 'Save': 'Bewaar',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
 'Save via Ajax': 'Bewaar via Ajax',
 'Saved file hash:': 'Opgeslagen bestandhash:',
+'Screenshot %s': 'Screenshot %s',
 'search': 'zoek',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'Geselecteerd',
 'session': 'sessie',
 'session expired': 'sessie verlopen',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
 'Set Breakpoint on %s at line %s: %s': 'Zet Breakpoint op %s op regel %s: %s',
 'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
 'signup': 'signup',
 'signup_requested': 'signup_requested',
 'Singular Form': 'Enkelvoudsvorm',
 'site': 'site',
 'Site': 'Site',
+'Size of cache:': 'Size of cache:',
 'skip to generate': 'sla over om te genereren',
 'some files could not be removed': 'sommige bestanden konden niet worden verwijderd',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
 'Sorry, could not find mercurial installed': 'Sorry, mercurial is niet geïnstalleerd',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
 'Start a new app': 'Start een nieuwe app',
+'Start searching': 'Start searching',
 'Start wizard': 'Start wizard',
 'state': 'state',
+'Static': 'Static',
 'static': 'statisch',
 'Static files': 'Statische bestanden',
+'Statistics': 'Statistics',
 'Step': 'Stap',
 'step': 'stap',
 'stop': 'stop',
 'submit': 'submit',
 'Submit': 'Submit',
 'successful': 'succesvol',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'tabel',
+'Table': 'Table',
 'tags': 'tags',
 'Temporary': 'tijdelijk',
 'test': 'test',
@@ -383,10 +536,12 @@
 'The application logic, each URL path is mapped in one exposed function in the controller': 'De applicatie logica, elk URL pad is gemapped in een blootgestelde functie in de controller',
 'The data representation, define database tables and sets': 'De data representatie, definieer database tabellen en sets',
 'The presentations layer, views are also known as templates': 'De presentatielaag, views ook bekend als templates',
+'Theme': 'Theme',
 'There are no controllers': 'Er zijn geen controllers',
 'There are no models': 'Er zijn geen modellen',
 'There are no modules': 'Er zijn geen modules',
 'There are no plugins': 'Er zijn geen plugins',
+'There are no private files': 'There are no private files',
 'There are no static files': 'Er zijn geen statische bestanden',
 'There are no translators': 'Er zijn geen vertalingen',
 'There are no translators, only default language is supported': 'Er zijn geen vertalingen, alleen de standaardtaal wordt ondersteund.',
@@ -405,6 +560,7 @@
 'ticket': 'ticket',
 'Ticket': 'Ticket',
 'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
 'tickets': 'tickets',
 'Time in Cache (h:m:s)': 'Tijd in Cache (u:m:s)',
 'to  previous version.': 'naar vorige versie.',
@@ -412,12 +568,16 @@
 'To emulate a breakpoint programatically, write:': 'Om een breakpoint programmatische te emuleren, schrijf:',
 'to use the debugger!': 'om de debugger te gebruiken!',
 'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
 'Translation strings for the application': 'Vertaalstrings van de applicatie',
 'try something like': 'probeer zoiets als',
+'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger commando hier en druk op Return (Enter) om het uit te voeren.',
 'Type python statement in here and hit Return (Enter) to execute it.': 'Type python statement hier en druk op Return (Enter) om het uit te voeren.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Onmogelijk om voor upgrades te checken',
 'unable to create application "%s"': 'onmogelijk om applicatie "%s" te maken',
 'unable to create application "%s" (it may exist already)': 'onmogelijk om applicatie "%s" te maken (mogelijk bestaat deze al)',
@@ -428,7 +588,9 @@
 'Unable to download because:': 'Onmogelijk om te downloaden omdat:',
 'unable to download layout': 'onmogelijk om layout te downloaden',
 'unable to download plugin: %s': 'onmogelijk om plugin te downloaden: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install application "%(appname)s"': 'onmogelijk om applicatie "%(appname)s" te installeren',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'onmogelijk om csv-bestand te parsen',
 'unable to uninstall "%s"': 'onmogelijk om te deïnstalleren "%s"',
 'unable to upgrade because "%s"': 'onmogelijk om te upgraden omdat "%s"',
@@ -442,14 +604,19 @@
 'Update:': 'Update:',
 'Upgrade': 'Upgrade',
 'upgrade now': 'upgrade now',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade_web2py': 'upgrade_web2py',
 'upload': 'upload',
+'Upload': 'Upload',
 'Upload a package:': 'Upload een package:',
 'Upload and install packed application': 'Upload en installeer packed applicatie',
 'upload file:': 'upload bestand:',
 'upload plugin file:': 'upload pluginbestand:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Gebruik (...)&(...) voor AND, (...)|(...) voor OR, en ~(...) voor NOT om meer complexe queries te maken.',
 'user': 'gebruiker',
+'User': 'User',
+'Username': 'Username',
+'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Het gebruik van de shell kan database locken voor andere gebruikers van deze app.',
 'value not allowed': 'waarde is niet toegestaan',
 'variables': 'variabelen',
@@ -459,8 +626,11 @@
 'view': 'view',
 'Views': 'Views',
 'views': 'views',
+'Warning!': 'Warning!',
 'WARNING:': 'WAARSCHUWING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
 'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
 'web2py apps to deploy': 'web2py apps om te deployen',
 'web2py Debugger': 'web2py Debugger',
 'web2py downgrade': 'web2py downgrade',
@@ -469,13 +639,17 @@
 'web2py Recent Tweets': 'web2py Recente Tweets',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py geupgrade; herstart alstublieft',
+'Working...': 'Working...',
 'Wrap with Abbreviation': 'Wrap met Afkorting',
 'WSGI reference name': 'WSGI reference name',
 'YES': 'JA',
+'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Je kan ook een breakpoint zetten of verwijderen in het bewerkscherm met de Toggle Breakpoint-knop',
+'You can inspect variables using the console bellow': 'Je kan je variabelen inspecteren in de console hieronder',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
 'You have one more login attempt before you are locked out': 'Je hebt nog een poging om in te loggen voor je buitengesloten wordt.',
 'you must specify a name for the uploaded application': 'je moet een naam specificeren voor de geuploade applicatie',
 'You need to set up and reach a': 'Je moet het volgende opzetten en bereiken:',
+'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Je applicatie zal geblokkeerd zijn tot je een actie button aanklikt (volgende, step, ga door, etc.)',
-'Your can inspect variables using the console bellow': 'Je kan je variabelen inspecteren in de console hieronder',
 }

applications/admin/languages/pl.py

@@ -1,196 +1,239 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'pl',
 '!langname!': 'Polska',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"Uaktualnij" jest dodatkowym wyrażeniem postaci "pole1=\'nowawartość\'". Nie możesz uaktualnić lub usunąć wyników z JOIN:',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': 'Wierszy usuniętych: %s',
 '%s %%{row} updated': 'Wierszy uaktualnionych: %s',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '(requires internet access)': '(requires internet access)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(coś podobnego do "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
 'A new version of web2py is available': 'Nowa wersja web2py jest dostępna',
 'A new version of web2py is available: %s': 'Nowa wersja web2py jest dostępna: %s',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'UWAGA: Wymagane jest bezpieczne (HTTPS) połączenie lub połączenie z lokalnego adresu.',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'UWAGA: TESTOWANIE NIE JEST BEZPIECZNE W ŚRODOWISKU WIELOWĄTKOWYM, TAK WIĘC NIE URUCHAMIAJ WIELU TESTÓW JEDNOCZEŚNIE.',
-'ATTENTION: you cannot edit the running application!': 'UWAGA: nie można edytować uruchomionych aplikacji!',
+'Abort': 'Abort',
 'About': 'informacje',
 'About application': 'Informacje o aplikacji',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
+'additional code for your application': 'dodatkowy kod Twojej aplikacji',
 'Additional code for your application': 'Additional code for your application',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': 'panel administracyjny wyłączony z powodu braku hasła administracyjnego',
+'admin disabled because not supported on google app engine': 'panel administracyjny wyłączony z powodu braku wsparcia na google apps engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': 'panel administracyjny wyłączony z powodu braku dostępu do pliku z hasłem',
 'Admin is disabled because insecure channel': 'Panel administracyjny wyłączony z powodu braku bezpiecznego połączenia',
 'Admin is disabled because unsecure channel': 'Panel administracyjny wyłączony z powodu braku bezpiecznego połączenia',
+'Admin language': 'Admin language',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'administrative interface',
 'Administrator Password:': 'Hasło administratora:',
+'and rename it (required):': 'i nadaj jej nową nazwę (wymagane):',
+'and rename it:': 'i nadaj mu nową nazwę:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'administracja aplikacji',
+'appadmin is disabled because insecure channel': 'administracja aplikacji wyłączona z powodu braku bezpiecznego połączenia',
+'Application': 'Application',
+'application "%s" uninstalled': 'aplikacja "%s" została odinstalowana',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'aplikacja została skompilowana',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'aplikacja jest skompilowana i nie może być projektowana',
 'Application name:': 'Application name:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Czy na pewno chcesz usunąć plik "%s"?',
 'Are you sure you want to delete plugin "%s"?': 'Czy na pewno chcesz usunąć wtyczkę "%s"?',
+'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'Are you sure you want to uninstall application "%s"': 'Czy na pewno chcesz usunąć aplikację "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Czy na pewno chcesz usunąć aplikację "%s"?',
 'Are you sure you want to upgrade web2py now?': 'Are you sure you want to upgrade web2py now?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'UWAGA: Wymagane jest bezpieczne (HTTPS) połączenie lub połączenie z lokalnego adresu.',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'UWAGA: TESTOWANIE NIE JEST BEZPIECZNE W ŚRODOWISKU WIELOWĄTKOWYM, TAK WIĘC NIE URUCHAMIAJ WIELU TESTÓW JEDNOCZEŚNIE.',
+'ATTENTION: you cannot edit the running application!': 'UWAGA: nie można edytować uruchomionych aplikacji!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Dostępne bazy danych i tabele',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'wstecz',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'pamięć podręczna, bilety błędów oraz pliki sesji zostały wyczyszczone',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
 'Cannot be empty': 'Nie może być puste',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Nie można skompilować: w Twojej aplikacji są błędy .        Znajdź je, popraw a następnie spróbój ponownie.',
 'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
+'cannot create file': 'nie można utworzyć pliku',
+'cannot upload file "%(filename)s"': 'nie można wysłać pliku "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
+'check all': 'zaznacz wszystko',
 'Check for upgrades': 'check for upgrades',
 'Check to delete': 'Zaznacz aby usunąć',
 'Checking for upgrades...': 'Sprawdzanie aktualizacji...',
 'Clean': 'oczyść',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
+'click here for online examples': 'kliknij aby przejść do interaktywnych przykładów',
+'click here for the administrative interface': 'kliknij aby przejść do panelu administracyjnego',
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
+'click to check for upgrades': 'kliknij aby sprawdzić aktualizacje',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'collapse/expand all',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'skompiluj',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'skompilowana aplikacja została usunięta',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controllers': 'Kontrolery',
+'controllers': 'kontrolery',
+'Count': 'Count',
 'Create': 'create',
+'create file with filename:': 'utwórz plik o nazwie:',
+'create new application:': 'utwórz nową aplikację:',
 'Create new simple application': 'Utwórz nową aplikację',
+'Create/Upload': 'Create/Upload',
+'created by': 'utworzone przez',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': 'crontab',
 'Current request': 'Aktualne żądanie',
 'Current response': 'Aktualna odpowiedź',
 'Current session': 'Aktualna sesja',
-'DESIGN': 'PROJEKTUJ',
-'Date and Time': 'Data i godzina',
-'Delete': 'Usuń',
-'Delete:': 'Usuń:',
-'Deploy': 'deploy',
-'Deploy on Google App Engine': 'Umieść na Google App Engine',
-'Design for': 'Projekt dla',
-'EDIT': 'EDYTUJ',
-'Edit': 'edytuj',
-'Edit application': 'Edycja aplikacji',
-'Edit current record': 'Edytuj aktualny rekord',
-'Editing Language file': 'Edytuj plik tłumaczeń',
-'Editing file': 'Edycja pliku',
-'Editing file "%s"': 'Edycja pliku "%s"',
-'Enterprise Web Framework': 'Enterprise Web Framework',
-'Error logs for "%(app)s"': 'Wpisy błędów dla "%(app)s"',
-'Errors': 'błędy',
-'Exception instance attributes': 'Exception instance attributes',
-'Functions with no doctests will result in [passed] tests.': 'Funkcje bez doctestów będą dołączone do [zaliczonych] testów.',
-'Hello World': 'Witaj Świecie',
-'Help': 'pomoc',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Jeżeli powyższy raport zawiera numer biletu błędu, oznacza to błąd podczas wykonywania kontrolera przez próbą uruchomienia doctestów. Zazwyczaj jest to spowodowane nieprawidłowymi wcięciami linii kodu lub błędami w module poza ciałem funkcji.\nTytuł w kolorze zielonym oznacza, ze wszystkie (zdefiniowane) testy zakończyły się sukcesem. W tej sytuacji ich wyniki nie są pokazane.',
-'Import/Export': 'Importuj/eksportuj',
-'Install': 'install',
-'Installed applications': 'Zainstalowane aplikacje',
-'Internal State': 'Stan wewnętrzny',
-'Invalid Query': 'Błędne zapytanie',
-'Invalid action': 'Błędna akcja',
-'Language files (static strings) updated': 'Pliki tłumaczeń (ciągi statyczne) zostały uaktualnione',
-'Languages': 'Tłumaczenia',
-'Last saved on:': 'Ostatnio zapisany:',
-'License for': 'Licencja dla',
-'Login': 'Zaloguj',
-'Login to the Administrative Interface': 'Logowanie do panelu administracyjnego',
-'Logout': 'wyloguj',
-'Models': 'Modele',
-'Modules': 'Moduły',
-'NO': 'NIE',
-'New Record': 'Nowy rekord',
-'New application wizard': 'New application wizard',
-'New simple application': 'New simple application',
-'No databases in this application': 'Brak baz danych w tej aplikacji',
-'Original/Translation': 'Oryginał/tłumaczenie',
-'Overwrite installed app': 'overwrite installed app',
-'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
-'Pack all': 'spakuj wszystko',
-'Pack compiled': 'spakuj skompilowane',
-'Peeking at file': 'Podgląd pliku',
-'Plugin "%s" in application': 'Wtyczka "%s" w aplikacji',
-'Plugins': 'Wtyczki',
-'Powered by': 'Zasilane przez',
-'Query:': 'Zapytanie:',
-'Remove compiled': 'usuń skompilowane',
-'Resolve Conflict file': 'Rozwiąż konflikt plików',
-'Rows in table': 'Wiersze w tabeli',
-'Rows selected': 'Wierszy wybranych',
-'Saved file hash:': 'Suma kontrolna zapisanego pliku:',
-'Site': 'strona główna',
-'Start wizard': 'start wizard',
-'Static files': 'Pliki statyczne',
-'Sure you want to delete this object?': 'Czy na pewno chcesz usunąć ten obiekt?',
-'TM': 'TM',
-'Testing application': 'Testowanie aplikacji',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Zapytanie" jest warunkiem postaci "db.tabela1.pole1==\'wartość\'". Takie coś jak "db.tabela1.pole1==db.tabela2.pole2" oznacza SQL JOIN.',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
-'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'There are no controllers': 'Brak kontrolerów',
-'There are no models': 'Brak modeli',
-'There are no modules': 'Brak modułów',
-'There are no plugins': 'There are no plugins',
-'There are no static files': 'Brak plików statycznych',
-'There are no translators, only default language is supported': 'Brak plików tłumaczeń, wspierany jest tylko domyślny język',
-'There are no views': 'Brak widoków',
-'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'This is the %(filename)s template': 'To jest szablon %(filename)s',
-'Ticket': 'Bilet',
-'To create a plugin, name a file/folder plugin_[name]': 'Aby utworzyć wtyczkę, nazwij plik/katalog plugin_[nazwa]',
-'Translation strings for the application': 'Translation strings for the application',
-'Unable to check for upgrades': 'Nie można sprawdzić aktualizacji',
-'Unable to download': 'Nie można ściągnąć',
-'Unable to download app': 'Nie można ściągnąć aplikacji',
-'Unable to download app because:': 'Unable to download app because:',
-'Unable to download because': 'Unable to download because',
-'Uninstall': 'odinstaluj',
-'Update:': 'Uaktualnij:',
-'Upload & install packed application': 'Upload & install packed application',
-'Upload a package:': 'Upload a package:',
-'Upload existing application': 'Wyślij istniejącą aplikację',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Użyj (...)&(...) jako AND, (...)|(...) jako OR oraz ~(...)  jako NOT do tworzenia bardziej skomplikowanych zapytań.',
-'Use an url:': 'Use an url:',
-'Version': 'Wersja',
-'Views': 'Widoki',
-'Welcome to web2py': 'Witaj w web2py',
-'YES': 'TAK',
-'additional code for your application': 'dodatkowy kod Twojej aplikacji',
-'admin disabled because no admin password': 'panel administracyjny wyłączony z powodu braku hasła administracyjnego',
-'admin disabled because not supported on google app engine': 'panel administracyjny wyłączony z powodu braku wsparcia na google apps engine',
-'admin disabled because unable to access password file': 'panel administracyjny wyłączony z powodu braku dostępu do pliku z hasłem',
-'administrative interface': 'administrative interface',
-'and rename it (required):': 'i nadaj jej nową nazwę (wymagane):',
-'and rename it:': 'i nadaj mu nową nazwę:',
-'appadmin': 'administracja aplikacji',
-'appadmin is disabled because insecure channel': 'administracja aplikacji wyłączona z powodu braku bezpiecznego połączenia',
-'application "%s" uninstalled': 'aplikacja "%s" została odinstalowana',
-'application compiled': 'aplikacja została skompilowana',
-'application is compiled and cannot be designed': 'aplikacja jest skompilowana i nie może być projektowana',
-'arguments': 'arguments',
-'back': 'wstecz',
-'cache': 'cache',
-'cache, errors and sessions cleaned': 'pamięć podręczna, bilety błędów oraz pliki sesji zostały wyczyszczone',
-'cannot create file': 'nie można utworzyć pliku',
-'cannot upload file "%(filename)s"': 'nie można wysłać pliku "%(filename)s"',
-'check all': 'zaznacz wszystko',
-'click here for online examples': 'kliknij aby przejść do interaktywnych przykładów',
-'click here for the administrative interface': 'kliknij aby przejść do panelu administracyjnego',
-'click to check for upgrades': 'kliknij aby sprawdzić aktualizacje',
-'code': 'code',
-'collapse/expand all': 'collapse/expand all',
-'compiled application removed': 'skompilowana aplikacja została usunięta',
-'controllers': 'kontrolery',
-'create file with filename:': 'utwórz plik o nazwie:',
-'create new application:': 'utwórz nową aplikację:',
-'created by': 'utworzone przez',
-'crontab': 'crontab',
 'currently running': 'currently running',
 'currently saved or': 'aktualnie zapisany lub',
 'data uploaded': 'dane wysłane',
+'Database': 'Database',
 'database': 'baza danych',
+'Database %s select': 'Database %s select',
 'database %s select': 'wybór z bazy danych %s',
+'Database administration': 'Database administration',
 'database administration': 'administracja bazy danych',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Date and Time': 'Data i godzina',
 'db': 'baza danych',
+'Debug': 'Debug',
 'defines tables': 'zdefiniuj tabele',
+'Delete': 'Usuń',
 'delete': 'usuń',
 'delete all checked': 'usuń wszystkie zaznaczone',
 'delete plugin': 'usuń wtyczkę',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'Usuń:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
+'Deploy': 'deploy',
+'Deploy on Google App Engine': 'Umieść na Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
 'design': 'projektuj',
+'DESIGN': 'PROJEKTUJ',
+'Design for': 'Projekt dla',
+'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
 'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
+'Disable': 'Disable',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
 'done!': 'zrobione!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
 'download layouts': 'download layouts',
+'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
+'Download plugins from repository': 'Download plugins from repository',
+'EDIT': 'EDYTUJ',
+'Edit': 'edytuj',
+'edit all': 'edit all',
+'Edit application': 'Edycja aplikacji',
 'edit controller': 'edytuj kontroler',
+'edit controller:': 'edit controller:',
+'Edit current record': 'Edytuj aktualny rekord',
 'edit views:': 'edit views:',
+'Editing %s': 'Editing %s',
+'Editing file': 'Edycja pliku',
+'Editing file "%s"': 'Edycja pliku "%s"',
+'Editing Language file': 'Edytuj plik tłumaczeń',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
+'Enterprise Web Framework': 'Enterprise Web Framework',
+'Error': 'Error',
+'Error logs for "%(app)s"': 'Wpisy błędów dla "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'błędy',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Exception instance attributes',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'eksportuj jako plik csv',
+'Exports:': 'Exports:',
 'exposes': 'eksponuje',
+'exposes:': 'exposes:',
 'extends': 'rozszerza',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module': 'nie udało się przeładować modułu',
 'failed to reload module because:': 'failed to reload module because:',
+'File': 'File',
 'file "%(filename)s" created': 'plik "%(filename)s" został utworzony',
 'file "%(filename)s" deleted': 'plik "%(filename)s" został usunięty',
 'file "%(filename)s" uploaded': 'plik "%(filename)s" został wysłany',
@@ -198,80 +241,400 @@
 'file "%s" of %s restored': 'plik "%s" z %s został odtworzony',
 'file changed on disk': 'plik na dysku został zmieniony',
 'file does not exist': 'plik nie istnieje',
+'file not found': 'file not found',
 'file saved on %(time)s': 'plik zapisany o %(time)s',
 'file saved on %s': 'plik zapisany o %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
 'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'Form has errors': 'Form has errors',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Funkcje bez doctestów będą dołączone do [zaliczonych] testów.',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Hello World': 'Witaj Świecie',
+'Help': 'pomoc',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'edytuj HTML',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Jeżeli powyższy raport zawiera numer biletu błędu, oznacza to błąd podczas wykonywania kontrolera przez próbą uruchomienia doctestów. Zazwyczaj jest to spowodowane nieprawidłowymi wcięciami linii kodu lub błędami w module poza ciałem funkcji.\nTytuł w kolorze zielonym oznacza, ze wszystkie (zdefiniowane) testy zakończyły się sukcesem. W tej sytuacji ich wyniki nie są pokazane.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'Importuj/eksportuj',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'zawiera',
+'Indent with tabs': 'Indent with tabs',
 'insert new': 'wstaw nowy rekord tabeli',
 'insert new %s': 'wstaw nowy rekord do tabeli %s',
+'inspect attributes': 'inspect attributes',
+'Install': 'install',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': 'Zainstalowane aplikacje',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'wewnętrzny błąd',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'Stan wewnętrzny',
+'Invalid action': 'Błędna akcja',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'błędne hasło',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Błędne zapytanie',
 'invalid request': 'błędne zapytanie',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'błędny bilet',
+'Key': 'Key',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'plik tłumaczeń "%(filename)s" został utworzony/uaktualniony',
+'Language files (static strings) updated': 'Pliki tłumaczeń (ciągi statyczne) zostały uaktualnione',
 'languages': 'pliki tłumaczeń',
+'Languages': 'Tłumaczenia',
 'languages updated': 'pliki tłumaczeń zostały uaktualnione',
+'Last Revision': 'Last Revision',
+'Last saved on:': 'Ostatnio zapisany:',
+'License for': 'Licencja dla',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': 'wczytywanie...',
+'Local Apps': 'Local Apps',
+'locals': 'locals',
+'Locals##debug': 'Locals##debug',
+'Login': 'Zaloguj',
 'login': 'zaloguj',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'Logowanie do panelu administracyjnego',
+'Login/Register': 'Login/Register',
+'Logout': 'wyloguj',
+'lost password': 'lost password',
+'Main Menu': 'Main Menu',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
 'merge': 'zespól',
+'Models': 'Modele',
 'models': 'modele',
+'Modified On': 'Modified On',
+'Modules': 'Moduły',
 'modules': 'moduły',
+'Multi User Mode': 'Multi User Mode',
 'new application "%s" created': 'nowa aplikacja "%s" została utworzona',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
+'New application wizard': 'New application wizard',
 'new plugin installed': 'nowa wtyczka została zainstalowana',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'Nowy rekord',
 'new record inserted': 'nowy rekord został wstawiony',
+'New simple application': 'New simple application',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': 'następne 100 wierszy',
+'NO': 'NIE',
+'no changes': 'no changes',
+'No databases in this application': 'Brak baz danych w tej aplikacji',
+'No Interaction yet': 'No Interaction yet',
 'no match': 'no match',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'lub zaimportuj z pliku csv',
 'or provide app url:': 'or provide app url:',
 'or provide application url:': 'lub podaj url aplikacji:',
+'Original/Translation': 'Oryginał/tłumaczenie',
+'Overview': 'Overview',
+'Overwrite installed app': 'overwrite installed app',
+'Pack all': 'spakuj wszystko',
+'Pack compiled': 'spakuj skompilowane',
+'Pack custom': 'Pack custom',
 'pack plugin': 'spakuj wtyczkę',
+'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
 'password changed': 'password changed',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Podgląd pliku',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'wtyczka "%(plugin)s" została usunięta',
+'Plugin "%s" in application': 'Wtyczka "%s" w aplikacji',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
 'plugins': 'plugins',
+'Plugins': 'Wtyczki',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Zasilane przez',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': 'poprzednie 100 wierszy',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Zapytanie:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
 'record': 'rekord',
 'record does not exist': 'rekord nie istnieje',
 'record id': 'ID rekordu',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Reload routes': 'Reload routes',
+'Remove compiled': 'usuń skompilowane',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
+'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Rozwiąż konflikt plików',
+'response': 'response',
+'restart': 'restart',
 'restore': 'odtwórz',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'przywróć',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in table': 'Wiersze w tabeli',
+'Rows in Table': 'Rows in Table',
+'Rows selected': 'Wierszy wybranych',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Running on %s',
+'Save': 'Save',
 'save': 'zapisz',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Suma kontrolna zapisanego pliku:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'zaznaczone',
+'session': 'session',
 'session expired': 'sesja wygasła',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'powłoka',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': 'strona główna',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': 'niektóre pliki nie mogły zostać usunięte',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Start searching',
+'Start wizard': 'start wizard',
 'state': 'stan',
+'Static': 'Static',
 'static': 'pliki statyczne',
+'Static files': 'Pliki statyczne',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
 'submit': 'wyślij',
+'Submit': 'Submit',
+'successful': 'successful',
+'Sure you want to delete this object?': 'Czy na pewno chcesz usunąć ten obiekt?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'tabela',
+'Table': 'Table',
+'Temporary': 'Temporary',
 'test': 'testuj',
+'Testing application': 'Testowanie aplikacji',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Zapytanie" jest warunkiem postaci "db.tabela1.pole1==\'wartość\'". Takie coś jak "db.tabela1.pole1==db.tabela2.pole2" oznacza SQL JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'logika aplikacji, każda ścieżka URL jest mapowana na jedną z funkcji eksponowanych w kontrolerze',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'the data representation, define database tables and sets': 'reprezentacja danych, definicje zbiorów i tabel bazy danych',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
 'the presentations layer, views are also known as templates': 'warstwa prezentacji, widoki zwane są również szablonami',
+'Theme': 'Theme',
+'There are no controllers': 'Brak kontrolerów',
+'There are no models': 'Brak modeli',
+'There are no modules': 'Brak modułów',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': 'Brak plików statycznych',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': 'Brak plików tłumaczeń, wspierany jest tylko domyślny język',
+'There are no views': 'Brak widoków',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'pliki obsługiwane bez interpretacji, to jest miejsce na Twoje obrazy',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'To jest szablon %(filename)s',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Bilet',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'TM': 'TM',
 'to  previous version.': 'do  poprzedniej wersji.',
+'To create a plugin, name a file/folder plugin_[name]': 'Aby utworzyć wtyczkę, nazwij plik/katalog plugin_[nazwa]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
 'translation strings for the application': 'ciągi tłumaczeń dla aplikacji',
+'Translation strings for the application': 'Translation strings for the application',
 'try': 'spróbój',
 'try something like': 'spróbój czegos takiego jak',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Nie można sprawdzić aktualizacji',
 'unable to create application "%s"': 'nie można utworzyć aplikacji "%s"',
 'unable to delete file "%(filename)s"': 'nie można usunąć pliku "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'nie można usunąc pliku wtyczki "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download': 'Nie można ściągnąć',
+'Unable to download app': 'Nie można ściągnąć aplikacji',
+'Unable to download app because:': 'Unable to download app because:',
+'Unable to download because': 'Unable to download because',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'nie można sparsować pliku csv',
 'unable to uninstall "%s"': 'nie można odinstalować "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'odznacz wszystko',
+'Uninstall': 'odinstaluj',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'uaktualnij',
 'update all languages': 'uaktualnij wszystkie pliki tłumaczeń',
+'Update:': 'Uaktualnij:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'upgrade web2py now',
 'upload': 'upload',
+'Upload': 'Upload',
+'Upload & install packed application': 'Upload & install packed application',
+'Upload a package:': 'Upload a package:',
+'Upload and install packed application': 'Upload and install packed application',
 'upload application:': 'wyślij plik aplikacji:',
+'Upload existing application': 'Wyślij istniejącą aplikację',
 'upload file:': 'wyślij plik:',
 'upload plugin file:': 'wyślij plik wtyczki:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Użyj (...)&(...) jako AND, (...)|(...) jako OR oraz ~(...)  jako NOT do tworzenia bardziej skomplikowanych zapytań.',
+'Use an url:': 'Use an url:',
+'User': 'User',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Version': 'Wersja',
+'Versioning': 'Versioning',
 'versioning': 'versioning',
 'view': 'widok',
+'Views': 'Widoki',
 'views': 'widoki',
-'web2py Recent Tweets': 'najnowsze tweety web2py',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py jest aktualne',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'najnowsze tweety web2py',
+'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome to web2py': 'Witaj w web2py',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'TAK',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/plural-en.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 {
 # "singular form (0)": ["first plural form (1)", "second plural form (2)", ...],
 'file': ['files'],

applications/admin/languages/plural-ru.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 {
 # "singular form (0)": ["first plural form (1)", "second plural form (2)", ...],
 'файл': ['файла','файлов'],

applications/admin/languages/plural-uk.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 {
 # "singular form (0)": ["first plural form (1)", "second plural form (2)", ...],
 'останній': ['останні','останніх'],

applications/admin/languages/pt-br.py

@@ -0,0 +1,664 @@
+# -*- coding: utf-8 -*-
+{
+'!langcode!': 'pt-br',
+'!langname!': 'Português Brasileiro',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" é uma expressão opcional como "campo1=\'novo_valor\'". Não é permitido atualizar ou apagar resultados de um JOIN',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
+'%s %%{row} deleted': '%s registros apagados',
+'%s %%{row} updated': '%s registros atualizados',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%d/%m/%Y',
+'%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
+'(requires internet access, experimental)': '(requer acesso à internet, experimental)',
+'(something like "it-it")': '(algo como "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Searching: **%s** %%{file}': 'Buscando: **%s** arquivos',
+'A new version of web2py is available': 'Está disponível uma nova versão do web2py',
+'A new version of web2py is available: %s': 'Está disponível uma nova versão do web2py: %s',
+'Abort': 'Abort',
+'About': 'sobre',
+'About application': 'Sobre a aplicação',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
+'additional code for your application': 'código adicional para sua aplicação',
+'Additional code for your application': 'Código adicional para sua aplicação',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': ' admin desabilitado por falta de senha definida',
+'admin disabled because not supported on google app engine': 'admin desabilitado porque não é suportado no GAE',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': 'admin desabilitado porque não foi possível ler o arquivo de senha',
+'Admin is disabled because insecure channel': 'Admin desabilitado pois o canal não é seguro',
+'Admin is disabled because unsecure channel': 'Admin desabilitado pois o canal não é seguro',
+'Admin language': 'Idioma do Admin',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'interface administrativa',
+'Administrator Password:': 'Senha de administrador:',
+'and rename it (required):': 'e renomeie (requerido):',
+'and rename it:': ' e renomeie:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'admin desabilitado porque o canal não é seguro',
+'Application': 'Application',
+'application "%s" uninstalled': 'aplicação "%s" desinstalada',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'aplicação compilada',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'A aplicação está compilada e não pode ser modificada',
+'Application name:': 'Nome da aplicação:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
+'Are you sure you want to delete file "%s"?': 'Tem certeza que deseja apagar o arquivo "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Tem certeza que deseja apagar o plugin "%s"?',
+'Are you sure you want to delete this object?': 'Tem certeza que deseja apagar esse objeto?',
+'Are you sure you want to uninstall application "%s"': 'Tem certeza que deseja desinstalar a aplicação "%s"?',
+'Are you sure you want to uninstall application "%s"?': 'Tem certeza que deseja desinstalar a aplicação "%s"?',
+'Are you sure you want to upgrade web2py now?': 'Tem certeza que deseja atualizar o web2py agora?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'argumentos',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENÇÃO: o login requer uma conexão segura (HTTPS) ou executar de localhost.',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENÇÃO OS TESTES NÃO SÃO THREAD SAFE, NÃO EFETUE MÚLTIPLOS TESTES AO MESMO TEMPO.',
+'ATTENTION: you cannot edit the running application!': 'ATENÇÃO: Não pode modificar a aplicação em execução!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
+'Available databases and tables': 'Bancos de dados e tabelas disponíveis',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'voltar',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Informações básicas',
+'Begin': 'Iniciar',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'browse': 'navegar',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'cache, erros e sessões eliminadas',
+'can be a git repo': 'pode ser um repositório git',
+'Cancel': 'Cancel',
+'Cannot be empty': 'Não pode ser vazio',
+'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Não é possível compilar: Existem erros em sua aplicação.       Depure, corrija os errros e tente novamente',
+'Cannot compile: there are errors in your app:': 'Não é possível compilar: Existem erros em sua aplicação',
+'cannot create file': 'Não é possível criar o arquivo',
+'cannot upload file "%(filename)s"': 'não é possível fazer upload do arquivo "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
+'Change admin password': 'mudar senha de administrador',
+'change editor settings': 'change editor settings',
+'Change Password': 'Mudar Senha',
+'Changelog': 'Changelog',
+'check all': 'marcar todos',
+'Check for upgrades': 'Verificar se existem atualizações',
+'Check to delete': 'Marque para apagar',
+'Checking for upgrades...': 'Buscando atualizações...',
+'Clean': 'Limpo',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
+'click here for online examples': 'clique para ver exemplos online',
+'click here for the administrative interface': 'Clique aqui para acessar a interface administrativa',
+'Click row to expand traceback': 'Clique na linha para expandir o traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
+'click to check for upgrades': 'clique aqui para verificar se existem atualizações',
+'click to open': 'clique para abrir',
+'Client IP': 'IP do cliente',
+'code': 'código',
+'Code listing': 'Code listing',
+'collapse/expand all': 'fechar/abrir todos',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'commit (mercurial)': 'commit (mercurial)',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
+'Compile': 'Compilar',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'a aplicação compilada foi removida',
+'Condition': 'Condition',
+'continue': 'continue',
+'Controllers': 'Controladores',
+'controllers': 'controladores',
+'Count': 'Contagem',
+'Create': 'Criar',
+'create file with filename:': 'criar um arquivo com o nome:',
+'Create new application using the Wizard': 'Criar nova aplicação utilizando o Assistente',
+'create new application:': 'nome da nova aplicação:',
+'Create new simple application': 'Crie uma nova aplicação',
+'Create/Upload': 'Create/Upload',
+'created by': 'criado por',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': 'crontab',
+'Current request': 'Requisição atual',
+'Current response': 'Resposta atual',
+'Current session': 'Sessão atual',
+'currently running': 'Executando',
+'currently saved or': 'Atualmente salvo ou',
+'customize me!': 'Modifique-me!',
+'data uploaded': 'Dados enviados',
+'Database': 'Database',
+'database': 'banco de dados',
+'Database %s select': 'Database %s select',
+'database %s select': 'Select no banco de dados %s',
+'Database administration': 'Database administration',
+'database administration': 'administração do banco de dados',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Date and Time': 'Data e Hora',
+'db': 'db',
+'Debug': 'Debug',
+'defines tables': 'define as tabelas',
+'Delete': 'Apague',
+'delete': 'apagar',
+'delete all checked': 'apagar marcados',
+'delete plugin': 'apagar plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'Apague:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
+'Deploy': 'Publicar',
+'Deploy on Google App Engine': 'Publicar no Google App Engine',
+'Deploy to OpenShift': 'Publicar no OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description': 'Descrição',
+'Description:': 'Description:',
+'design': 'projeto',
+'DESIGN': 'Projeto',
+'Design for': 'Projeto de',
+'Detailed traceback description': 'Descrição detalhada do traceback',
+'details': 'details',
+'direction: ltr': 'direção: ltr',
+'directory not found': 'directory not found',
+'Disable': 'Desabilitar',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
+'done!': 'feito!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
+'download layouts': 'download de layouts',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'download de plugins',
+'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
+'EDIT': 'EDITAR',
+'Edit': 'Editar',
+'edit all': 'editar todos',
+'Edit application': 'Editar aplicação',
+'edit controller': 'editar controlador',
+'edit controller:': 'edit controller:',
+'Edit current record': 'Editar o registro atual',
+'Edit Profile': 'Editar Perfil',
+'edit views:': 'editar visões:',
+'Editing %s': 'Editing %s',
+'Editing file': 'Editando arquivo',
+'Editing file "%s"': 'Editando arquivo "%s"',
+'Editing Language file': 'Editando arquivo de idioma',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
+'Enterprise Web Framework': 'Framework Web Corporativo',
+'Error': 'Erro',
+'Error logs for "%(app)s"': 'Logs de erro para "%(app)s"',
+'Error snapshot': 'Momento do Erro',
+'Error ticket': 'Tiquete de Erro',
+'Errors': 'Erros',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Atributos de instância da Exception',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
+'export as csv file': 'exportar como arquivo CSV',
+'Exports:': 'Exports:',
+'exposes': 'expõe',
+'exposes:': 'exposes:',
+'extends': 'estende',
+'failed to compile file because:': 'failed to compile file because:',
+'failed to reload module': 'Falha ao recarregar o módulo',
+'failed to reload module because:': 'falha ao recarregar o módulo porque:',
+'File': 'Arquivo',
+'file "%(filename)s" created': 'arquivo "%(filename)s" criado',
+'file "%(filename)s" deleted': 'arquivo "%(filename)s" apagado',
+'file "%(filename)s" uploaded': 'arquivo "%(filename)s" enviado',
+'file "%(filename)s" was not deleted': 'arquivo "%(filename)s" não foi apagado',
+'file "%s" of %s restored': 'arquivo "%s" de %s restaurado',
+'file changed on disk': 'arquivo modificado no disco',
+'file does not exist': 'arquivo não existe',
+'file not found': 'file not found',
+'file saved on %(time)s': 'arquivo salvo em %(time)s',
+'file saved on %s': 'arquivo salvo em %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
+'filter': 'filtro',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'First name': 'Nome',
+'Form has errors': 'Form has errors',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Funções sem doctests resultarão em testes [aceitos].',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Gerar',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'vai!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Group ID': 'ID do Grupo',
+'Hello World': 'Olá Mundo',
+'Help': 'Ajuda',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
+'htmledit': 'htmledit',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Se o relatório acima contém um número de ticket, isso indica uma falha no controlador em execução, antes de tentar executar os doctests. Isto acontece geralmente por erro de identação ou um erro fora do código da função.\nO título em verde indica que os testes (se definidos) passaram. Neste caso o resultado dos testes não são mostrados.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'Importar/Exportar',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
+'includes': 'inclui',
+'Indent with tabs': 'Indent with tabs',
+'insert new': 'inserir novo',
+'insert new %s': 'inserir novo %s',
+'inspect attributes': 'inspeciona atributos',
+'Install': 'instalar',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': 'Aplicações instaladas',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
+'internal error': 'erro interno',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'Estado Interno',
+'Invalid action': 'Ação inválida',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'E-mail inválido',
+'Invalid git repository specified.': 'Invalid git repository specified.',
+'invalid password': 'senha inválida',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Consulta inválida',
+'invalid request': 'solicitação inválida',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
+'invalid ticket': 'ticket inválido',
+'Key': 'Key',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
+'language file "%(filename)s" created/updated': 'arquivo de idioma "%(filename)s" criado/atualizado',
+'Language files (static strings) updated': 'Arquivos de idioma (textos estáticos) atualizados',
+'languages': 'idiomas',
+'Languages': 'Idiomas',
+'languages updated': 'idiomas atualizados',
+'Last name': 'Sobrenome',
+'Last Revision': 'Last Revision',
+'Last saved on:': 'Salvo pela última vez em:',
+'License for': 'Licença para',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
+'loading...': 'carregando...',
+'Local Apps': 'Local Apps',
+'locals': 'locals',
+'Locals##debug': 'Locals##debug',
+'login': 'início de sessão',
+'Login': 'Entrar',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'Entrar na interface adminitrativa',
+'Login/Register': 'Login/Register',
+'Logout': 'finalizar sessão',
+'Lost Password': 'Perdi a senha',
+'lost password': 'lost password',
+'Main Menu': 'Main Menu',
+'Manage': 'Gerenciar',
+'manage': 'gerenciar',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
+'merge': 'juntar',
+'models': 'modelos',
+'Models': 'Modelos',
+'Modified On': 'Modified On',
+'Modules': 'Módulos',
+'modules': 'módulos',
+'Multi User Mode': 'Multi User Mode',
+'Name': 'Nome',
+'new application "%s" created': 'nova aplicação "%s" criada',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'Assistente para novas aplicações ',
+'New application wizard': 'Assistente para novas aplicações',
+'new plugin installed': 'novo plugin instalado',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'Novo registro',
+'new record inserted': 'novo registro inserido',
+'New simple application': 'Nova aplicação básica',
+'next': 'next',
+'next %s rows': 'next %s rows',
+'next 100 rows': 'próximos 100 registros',
+'NO': 'NÃO',
+'no changes': 'no changes',
+'No databases in this application': 'Não existem bancos de dados nesta aplicação',
+'No Interaction yet': 'No Interaction yet',
+'no match': 'não encontrado',
+'no package selected': 'nenhum pacote selecionado',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Ou baixa da URL:',
+'or import from csv file': 'ou importar de um arquivo CSV',
+'or provide app url:': 'ou forneça a url de uma aplicação:',
+'or provide application url:': 'ou forneça a url de uma aplicação:',
+'Origin': 'Origem',
+'Original/Translation': 'Original/Tradução',
+'Overview': 'Overview',
+'Overwrite installed app': 'Sobrescrever aplicação instalada',
+'Pack all': 'Criar pacote',
+'Pack compiled': 'Criar pacote compilado',
+'Pack custom': 'Customizar pacote',
+'pack plugin': 'empacotar plugin',
+'PAM authenticated user, cannot change password here': 'usuário autenticado por PAM não pode alterar a senha aqui',
+'Password': 'Senha',
+'password changed': 'senha alterada',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Visualizando arquivo',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
+'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" apagado',
+'Plugin "%s" in application': 'Plugin "%s" na aplicação',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
+'plugins': 'plugins',
+'Plugins': 'Plugins',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Este site utiliza',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
+'previous 100 rows': '100 registros anteriores',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Consulta:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
+'record': 'registro',
+'record does not exist': 'o registro não existe',
+'record id': 'id do registro',
+'Record ID': 'ID do Registro',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Register': 'Registrar-se',
+'Registration key': 'Chave de registro',
+'Reload routes': 'Recarregar routes',
+'Remove compiled': 'Eliminar compilados',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
+'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Arquivo de resolução de conflito',
+'response': 'response',
+'restart': 'reiniciar',
+'restore': 'restaurar',
+'return': 'return',
+'Revert': 'Revert',
+'revert': 'reverter',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Papel',
+'Roles': 'Roles',
+'Rows in table': 'Registros na tabela',
+'Rows in Table': 'Rows in Table',
+'Rows selected': 'Registros selecionados',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Rodando em %s',
+'Save': 'Save',
+'save': 'salvar',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Hash do arquivo salvo:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Selecione arquivos para empacotar',
+'selected': 'selecionado(s)',
+'session': 'session',
+'session expired': 'sessão expirada',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
+'shell': 'Terminal',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': 'Site',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'pular para a gerar a aplicação',
+'some files could not be removed': 'alguns arquivos não puderam ser removidos',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Inicie uma nova aplicação',
+'Start searching': 'Start searching',
+'Start wizard': 'Iniciar assistente',
+'state': 'estado',
+'Static': 'Static',
+'static': 'estáticos',
+'Static files': 'Arquivos estáticos',
+'Statistics': 'Statistics',
+'Step': 'Passo',
+'step': 'step',
+'stop': 'stop',
+'submit': 'enviar',
+'Submit': 'Enviar',
+'successful': 'successful',
+'Sure you want to delete this object?': 'Tem certeza que deseja apagar este objeto?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
+'table': 'tabela',
+'Table': 'Table',
+'Table name': 'Nome da tabela',
+'Temporary': 'Temporary',
+'test': 'testar',
+'Testing application': 'Testando a aplicação',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'A "consulta" é uma condição como "db.tabela.campo1==\'valor\'". Algo como "db.tabela1.campo1==db.tabela2.campo2" resulta em um JOIN SQL.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
+'the application logic, each URL path is mapped in one exposed function in the controller': 'A lógica da aplicação, cada URL é mapeada para uma função exposta pelo controlador',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'A lógica da aplicação, cada URL é mapeada para uma função exposta pelo controlador',
+'the data representation, define database tables and sets': 'A representação dos dados, define tabelas do banco de dados e conjuntos',
+'The data representation, define database tables and sets': 'A representação dos dados, define tabelas do banco de dados e conjuntos',
+'The presentations layer, views are also known as templates': 'A camada de apresentação, as visões também são chamadas de templates',
+'the presentations layer, views are also known as templates': 'A camada de apresentação, as visões também são chamadas de templates',
+'Theme': 'Theme',
+'There are no controllers': 'Não existem controladores',
+'There are no models': 'Não existem modelos',
+'There are no modules': 'Não existem módulos',
+'There are no plugins': 'Não existem plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': 'Não existem arquicos estáticos',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': 'Não há tradutores, somente a linguagem padrão é suportada',
+'There are no views': 'Não existem visões',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'Estes arquivos são servidos sem processamento, suas imagens ficam aqui',
+'these files are served without processing, your images go here': 'Estes arquivos são servidos sem processamento, suas imagens ficam aqui',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'Este é o template %(filename)s',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Ticket',
+'Ticket ID': 'Número do Ticket',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Momento de geração',
+'TM': 'MR',
+'to  previous version.': 'para a versão anterior.',
+'To create a plugin, name a file/folder plugin_[name]': 'Para criar um plugin, nomeie um arquivo/pasta como plugin_[nome]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
+'translation strings for the application': 'textos traduzidos para a aplicação',
+'Translation strings for the application': 'textos traduzidos para a aplicação',
+'try': 'tente',
+'try something like': 'tente algo como',
+'Try the mobile interface': 'Experimente a interface para smartphones e tablets',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Não é possível checar as atualizações',
+'unable to create application "%s"': 'não é possível criar a aplicação "%s"',
+'unable to delete file "%(filename)s"': 'não é possível criar o arquivo "%(filename)s"',
+'unable to delete file plugin "%(plugin)s"': 'não é possível criar o plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download': 'Não é possível efetuar o download',
+'Unable to download app': 'Não é possível baixar a aplicação',
+'Unable to download app because:': 'Não é possível baixar a aplicação porque:',
+'Unable to download because': 'Não é possível baixar porque',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
+'unable to parse csv file': 'não é possível analisar o arquivo CSV',
+'unable to uninstall "%s"': 'não é possível desinstalar "%s"',
+'unable to upgrade because "%s"': 'não é possível atualizar porque "%s"',
+'uncheck all': 'desmarcar todos',
+'Uninstall': 'Desinstalar',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
+'update': 'alterar',
+'update all languages': 'alterar todos os idiomas',
+'Update:': 'Alterar:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'Atualize agora para %s',
+'upgrade web2py now': 'atualize o web2py agora',
+'upload': 'upload',
+'Upload': 'Upload',
+'Upload a package:': 'Faça upload de um pacote:',
+'Upload and install packed application': 'Faça upload e instale uma aplicação empacotada',
+'upload application:': 'Fazer upload de uma aplicação:',
+'Upload existing application': 'Faça upload de uma aplicação existente',
+'upload file:': 'Enviar arquivo:',
+'upload plugin file:': 'Enviar arquivo de plugin:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, e ~(...) para NOT, para criar consultas mais complexas.',
+'Use an url:': 'Use uma url:',
+'User': 'User',
+'User ID': 'ID do Usuário',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
+'variables': 'variáveis',
+'Version': 'Versão',
+'Versioning': 'Versionamento',
+'versioning': 'versionamento',
+'view': 'visão',
+'Views': 'Visões',
+'views': 'visões',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
+'web2py is up to date': 'web2py está atualizado',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'Tweets Recentes de @web2py',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py atualizado; favor reiniciar',
+'Welcome to web2py': 'Bem-vindo ao web2py',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'SIM',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+}

applications/admin/languages/pt.py

@@ -1,232 +1,251 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'pt',
 '!langname!': 'Português',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" é uma expressão opcional como "campo1=\'novo_valor\'". Não é permitido atualizar ou apagar resultados de um JOIN',
-'%Y-%m-%d': '%d/%m/%Y',
-'%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s registros apagados',
 '%s %%{row} updated': '%s registros atualizados',
-'(requires internet access)': '(requer acesso a internet)',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%d/%m/%Y',
+'%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
+'(requires internet access)': '(requer acesso à internet)',
+'(requires internet access, experimental)': '(requer acesso à internet, experimental)',
 '(something like "it-it")': '(algo como "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
 'A new version of web2py is available': 'Está disponível uma nova versão do web2py',
 'A new version of web2py is available: %s': 'Está disponível uma nova versão do web2py: %s',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENÇÃO o login requer uma conexão segura (HTTPS) ou executar de localhost.',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENÇÃO OS TESTES NÃO THREAD SAFE, NÃO EFETUE MÚLTIPLOS TESTES AO MESMO TEMPO.',
-'ATTENTION: you cannot edit the running application!': 'ATENÇÃO: Não pode modificar a aplicação em execução!',
+'Abort': 'Abort',
 'About': 'sobre',
 'About application': 'Sobre a aplicação',
-'Additional code for your application': 'Additional code for your application',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
+'additional code for your application': 'código adicional para sua aplicação',
+'Additional code for your application': 'Código adicional para a sua aplicação',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': ' admin desabilitado por falta de senha definida',
+'admin disabled because not supported on google app engine': 'admin dehabilitado, não é soportado no GAE',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': 'admin desabilitado, não foi possível ler o arquivo de senha',
 'Admin is disabled because insecure channel': 'Admin desabilitado pois o canal não é seguro',
 'Admin is disabled because unsecure channel': 'Admin desabilitado pois o canal não é seguro',
 'Admin language': 'Linguagem do Admin',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'interface administrativa',
 'Administrator Password:': 'Senha de administrador:',
+'and rename it (required):': 'e renomeie (requerido):',
+'and rename it:': ' e renomeie:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'admin desabilitado, canal inseguro',
+'Application': 'Application',
+'application "%s" uninstalled': 'aplicação "%s" desinstalada',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'aplicação compilada',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'A aplicação está compilada e não pode ser modificada',
 'Application name:': 'Nome da aplicação:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'não usadas',
+'are not used yet': 'ainda não usadas',
 'Are you sure you want to delete file "%s"?': 'Tem certeza que deseja apagar o arquivo "%s"?',
 'Are you sure you want to delete plugin "%s"?': 'Tem certeza que deseja apagar o plugin "%s"?',
+'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'Are you sure you want to uninstall application "%s"': 'Tem certeza que deseja apagar a aplicação "%s"?',
 'Are you sure you want to uninstall application "%s"?': 'Tem certeza que deseja apagar a aplicação "%s"?',
 'Are you sure you want to upgrade web2py now?': 'Tem certeza que deseja atualizar o web2py agora?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'argumentos',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENÇÃO o login requer uma conexão segura (HTTPS) ou executar de localhost.',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENÇÃO OS TESTES NÃO THREAD SAFE, NÃO EFETUE MÚLTIPLOS TESTES AO MESMO TEMPO.',
+'ATTENTION: you cannot edit the running application!': 'ATENÇÃO: Não pode modificar a aplicação em execução!',
+'Autocomplete Python Code': 'Autocompletar Código Python',
 'Available databases and tables': 'Bancos de dados e tabelas disponíveis',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'voltar',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'browse': 'buscar',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'cache, erros e sessões eliminadas',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
 'Cannot be empty': 'Não pode ser vazio',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Não é possível compilar: Existem erros em sua aplicação.       Depure, corrija os errros e tente novamente',
 'Cannot compile: there are errors in your app:': 'Não é possível compilar: Existem erros em sua aplicação',
-'Change Password': 'Trocar Senha',
+'cannot create file': 'Não é possível criar o arquivo',
+'cannot upload file "%(filename)s"': 'não é possível fazer upload do arquivo "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'mudar senha de administrador',
+'change editor settings': 'mudar definições do editor',
+'Change Password': 'Trocar Senha',
+'Changelog': 'Changelog',
+'check all': 'marcar todos',
 'Check for upgrades': 'checar por atualizações',
 'Check to delete': 'Marque para apagar',
 'Checking for upgrades...': 'Buscando atualizações...',
 'Clean': 'limpar',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
+'click here for online examples': 'clique para ver exemplos online',
+'click here for the administrative interface': 'Clique aqui para acessar a interface administrativa',
 'Click row to expand traceback': 'Clique em uma coluna para expandir o log do erro',
+'Click row to view a ticket': 'Click row to view a ticket',
+'click to check for upgrades': 'clique aqui para checar por atualizações',
+'click to open': 'clique para abrir',
 'Client IP': 'IP do cliente',
+'code': 'código',
+'Code listing': 'Code listing',
+'collapse/expand all': 'colapsar/expandir tudo',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'commit (mercurial)': 'commit (mercurial)',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'compilar',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'aplicação compilada removida',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controllers': 'Controladores',
+'controllers': 'controladores',
 'Count': 'Contagem',
 'Create': 'criar',
+'create file with filename:': 'criar um arquivo com o nome:',
 'Create new application using the Wizard': 'Criar nova aplicação utilizando o assistente',
+'create new application:': 'nome da nova aplicação:',
 'Create new simple application': 'Crie uma nova aplicação',
+'Create/Upload': 'Create/Upload',
+'created by': 'criado por',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': 'crontab',
 'Current request': 'Requisição atual',
 'Current response': 'Resposta atual',
 'Current session': 'Sessão atual',
-'DESIGN': 'Projeto',
+'currently running': 'Executando',
+'currently saved or': 'Atualmente salvo ou',
+'customize me!': 'Modifique-me',
+'data uploaded': 'Dados enviados',
+'Database': 'Database',
+'database': 'banco de dados',
+'Database %s select': 'Database %s select',
+'database %s select': 'Seleção no banco de dados %s',
+'Database administration': 'Database administration',
+'database administration': 'administração de banco de dados',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Data e Hora',
+'db': 'db',
+'Debug': 'Debug',
+'defines tables': 'define as tabelas',
 'Delete': 'Apague',
+'delete': 'apagar',
+'delete all checked': 'apagar marcados',
+'delete plugin': 'apagar plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
 'Delete:': 'Apague:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
 'Deploy': 'publicar',
 'Deploy on Google App Engine': 'Publicar no Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
 'Description': 'Descrição',
+'Description:': 'Description:',
+'design': 'modificar',
+'DESIGN': 'Projeto',
 'Design for': 'Projeto de',
 'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
+'direction: ltr': 'direção: ltr',
+'directory not found': 'directory not found',
+'Disable': 'Disable',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
+'done!': 'feito!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
+'download layouts': 'download layouts',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'download plugins',
+'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'E-mail',
 'EDIT': 'EDITAR',
 'Edit': 'editar',
-'Edit Profile': 'Editar Perfil',
+'edit all': 'edit all',
 'Edit application': 'Editar aplicação',
+'edit controller': 'editar controlador',
+'edit controller:': 'edit controller:',
 'Edit current record': 'Editar o registro atual',
-'Editing Language file': 'Editando arquivo de linguagem',
+'Edit Profile': 'Editar Perfil',
+'edit views:': 'editar visões:',
+'Editing %s': 'A Editar %s',
 'Editing file': 'Editando arquivo',
 'Editing file "%s"': 'Editando arquivo "%s"',
+'Editing Language file': 'Editando arquivo de linguagem',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'Enterprise Web Framework': 'Framework web empresarial',
 'Error': 'Erro',
 'Error logs for "%(app)s"': 'Logs de erro para "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'erros',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Atributos da instancia de excessão',
-'File': 'Arquivo',
-'First name': 'Nome',
-'Frames': 'Frames',
-'Functions with no doctests will result in [passed] tests.': 'Funções sem doctests resultarão em testes [aceitos].',
-'Group ID': 'ID do Grupo',
-'Hello World': 'Olá Mundo',
-'Help': 'ajuda',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Se o relatório acima contém um número de ticket, isso indica uma falha no controlador em execução, antes de tantar executar os doctests. Isto acontece geralmente por erro de endentação ou erro fora do código da função.\nO titulo em verde indica que os testes (se definidos) passaram. Neste caso os testes não são mostrados.',
-'Import/Export': 'Importar/Exportar',
-'Install': 'instalar',
-'Installed applications': 'Aplicações instaladas',
-'Internal State': 'Estado Interno',
-'Invalid Query': 'Consulta inválida',
-'Invalid action': 'Ação inválida',
-'Invalid email': 'E-mail inválido',
-'Language files (static strings) updated': 'Arquivos de linguagem (textos estáticos) atualizados',
-'Languages': 'Linguagens',
-'Last name': 'Sobrenome',
-'Last saved on:': 'Salvo em:',
-'License for': 'Licença para',
-'Login': 'Entrar',
-'Login to the Administrative Interface': 'Entrar na interface adminitrativa',
-'Logout': 'finalizar sessão',
-'Lost Password': 'Senha perdida',
-'Models': 'Modelos',
-'Modules': 'Módulos',
-'NO': 'NÃO',
-'Name': 'Nome',
-'New Record': 'Novo registro',
-'New application wizard': 'Assistente para novas aplicações ',
-'New simple application': 'Nova aplicação básica',
-'No databases in this application': 'Não existem bancos de dados nesta aplicação',
-'Origin': 'Origem',
-'Original/Translation': 'Original/Tradução',
-'Overwrite installed app': 'sobrescrever aplicação instalada',
-'PAM authenticated user, cannot change password here': 'usuario autenticado por PAM, não pode alterar a senha por aqui',
-'Pack all': 'criar pacote',
-'Pack compiled': 'criar pacote compilado',
-'Password': 'Senha',
-'Peeking at file': 'Visualizando arquivo',
-'Plugin "%s" in application': 'Plugin "%s" na aplicação',
-'Plugins': 'Plugins',
-'Powered by': 'Este site utiliza',
-'Query:': 'Consulta:',
-'Record ID': 'ID do Registro',
-'Register': 'Registrar-se',
-'Registration key': 'Chave de registro',
-'Remove compiled': 'eliminar compilados',
-'Resolve Conflict file': 'Arquivo de resolução de conflito',
-'Role': 'Papel',
-'Rows in table': 'Registros na tabela',
-'Rows selected': 'Registros selecionados',
-'Saved file hash:': 'Hash do arquivo salvo:',
-'Site': 'site',
-'Start wizard': 'iniciar assistente',
-'Static files': 'Arquivos estáticos',
-'Sure you want to delete this object?': 'Tem certeza que deseja apaagr este objeto?',
-'TM': 'MR',
-'Table name': 'Nome da tabela',
-'Testing application': 'Testando a aplicação',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'A "consulta" é uma condição como "db.tabela.campo1==\'valor\'". Algo como "db.tabela1.campo1==db.tabela2.campo2" resulta em um JOIN SQL.',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
-'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'There are no controllers': 'Não existem controllers',
-'There are no models': 'Não existem modelos',
-'There are no modules': 'Não existem módulos',
-'There are no plugins': 'There are no plugins',
-'There are no static files': 'Não existem arquicos estáticos',
-'There are no translators, only default language is supported': 'Não há traduções, somente a linguagem padrão é suportada',
-'There are no views': 'Não existem visões',
-'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'This is the %(filename)s template': 'Este é o template %(filename)s',
-'Ticket': 'Ticket',
-'Ticket ID': 'Ticket ID',
-'Timestamp': 'Data Atual',
-'To create a plugin, name a file/folder plugin_[name]': 'Para criar um plugin, nomeio um arquivo/pasta como plugin_[nome]',
-'Traceback': 'Traceback',
-'Translation strings for the application': 'Translation strings for the application',
-'Unable to check for upgrades': 'Não é possível checar as atualizações',
-'Unable to download': 'Não é possível efetuar o download',
-'Unable to download app': 'Não é possível baixar a aplicação',
-'Unable to download app because:': 'Não é possível baixar a aplicação porque:',
-'Unable to download because': 'Não é possível baixar porque',
-'Uninstall': 'desinstalar',
-'Update:': 'Atualizar:',
-'Upload & install packed application': 'Faça upload e instale uma aplicação empacotada',
-'Upload a package:': 'Faça upload de um pacote:',
-'Upload existing application': 'Faça upload de uma aplicação existente',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, y ~(...) para NOT, para criar consultas mais complexas.',
-'Use an url:': 'Use uma url:',
-'User ID': 'ID do Usuario',
-'Version': 'Versão',
-'Views': 'Visões',
-'Welcome to web2py': 'Bem-vindo ao web2py',
-'YES': 'SIM',
-'additional code for your application': 'código adicional para sua aplicação',
-'admin disabled because no admin password': ' admin desabilitado por falta de senha definida',
-'admin disabled because not supported on google app engine': 'admin dehabilitado, não é soportado no GAE',
-'admin disabled because unable to access password file': 'admin desabilitado, não foi possível ler o arquivo de senha',
-'administrative interface': 'interface administrativa',
-'and rename it (required):': 'e renomeie (requerido):',
-'and rename it:': ' e renomeie:',
-'appadmin': 'appadmin',
-'appadmin is disabled because insecure channel': 'admin desabilitado, canal inseguro',
-'application "%s" uninstalled': 'aplicação "%s" desinstalada',
-'application compiled': 'aplicação compilada',
-'application is compiled and cannot be designed': 'A aplicação está compilada e não pode ser modificada',
-'arguments': 'argumentos',
-'back': 'voltar',
-'browse': 'buscar',
-'cache': 'cache',
-'cache, errors and sessions cleaned': 'cache, erros e sessões eliminadas',
-'cannot create file': 'Não é possível criar o arquivo',
-'cannot upload file "%(filename)s"': 'não é possível fazer upload do arquivo "%(filename)s"',
-'check all': 'marcar todos',
-'click here for online examples': 'clique para ver exemplos online',
-'click here for the administrative interface': 'Clique aqui para acessar a interface administrativa',
-'click to check for upgrades': 'clique aqui para checar por atualizações',
-'click to open': 'clique para abrir',
-'code': 'código',
-'collapse/expand all': 'collapse/expand all',
-'commit (mercurial)': 'commit (mercurial)',
-'compiled application removed': 'aplicação compilada removida',
-'controllers': 'controladores',
-'create file with filename:': 'criar um arquivo com o nome:',
-'create new application:': 'nome da nova aplicação:',
-'created by': 'criado por',
-'crontab': 'crontab',
-'currently running': 'Executando',
-'currently saved or': 'Atualmente salvo ou',
-'customize me!': 'Modifique-me',
-'data uploaded': 'Dados enviados',
-'database': 'banco de dados',
-'database %s select': 'Seleção no banco de dados %s',
-'database administration': 'administração de banco de dados',
-'db': 'db',
-'defines tables': 'define as tabelas',
-'delete': 'apagar',
-'delete all checked': 'apagar marcados',
-'delete plugin': 'apagar plugin',
-'design': 'modificar',
-'direction: ltr': 'direção: ltr',
-'done!': 'feito!',
-'download layouts': 'download layouts',
-'download plugins': 'download plugins',
-'edit controller': 'editar controlador',
-'edit views:': 'editar visões:',
+'Exit Fullscreen': 'Sair de Ecrã Inteiro',
+'Expand Abbreviation (html files only)': 'Expandir Abreviação (só para ficheiros html)',
 'export as csv file': 'exportar como arquivo CSV',
+'Exports:': 'Exports:',
 'exposes': 'expõe',
+'exposes:': 'exposes:',
 'extends': 'estende',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module': 'Falha ao recarregar o módulo',
 'failed to reload module because:': 'falha ao recarregar o módulo por:',
+'File': 'Arquivo',
 'file "%(filename)s" created': 'arquivo "%(filename)s" criado',
 'file "%(filename)s" deleted': 'arquivo "%(filename)s" apagado',
 'file "%(filename)s" uploaded': 'arquivo "%(filename)s" enviado',
@@ -234,86 +253,418 @@
 'file "%s" of %s restored': 'arquivo "%s" de %s restaurado',
 'file changed on disk': 'arquivo modificado no disco',
 'file does not exist': 'arquivo não existe',
+'file not found': 'file not found',
 'file saved on %(time)s': 'arquivo salvo em %(time)s',
 'file saved on %s': 'arquivo salvo em %s',
-'filter': 'filter',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
+'filter': 'filtro',
+'Find Next': 'Localizar Seguinte',
+'Find Previous': 'Localizar Anterior',
+'First name': 'Nome',
+'Form has errors': 'Form has errors',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Funções sem doctests resultarão em testes [aceitos].',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Group ID': 'ID do Grupo',
+'Hello World': 'Olá Mundo',
+'Help': 'ajuda',
+'here': 'here',
+'Hide/Show Translated strings': '',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'htmledit',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Se o relatório acima contém um número de ticket, isso indica uma falha no controlador em execução, antes de tantar executar os doctests. Isto acontece geralmente por erro de endentação ou erro fora do código da função.\r\nO titulo em verde indica que os testes (se definidos) passaram. Neste caso os testes não são mostrados.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'Importar/Exportar',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'inclui',
+'Indent with tabs': 'Indent with tabs',
 'insert new': 'inserir novo',
 'insert new %s': 'inserir novo %s',
-'inspect attributes': 'inspect attributes',
+'inspect attributes': 'inspecionar atributos',
+'Install': 'instalar',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': 'Aplicações instaladas',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'erro interno',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'Estado Interno',
+'Invalid action': 'Ação inválida',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'E-mail inválido',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'senha inválida',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Consulta inválida',
 'invalid request': 'solicitação inválida',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'ticket inválido',
+'Key': 'Key',
+'Keyboard shortcuts': 'Atalhos de teclado',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'arquivo de linguagem "%(filename)s" criado/atualizado',
+'Language files (static strings) updated': 'Arquivos de linguagem (textos estáticos) atualizados',
 'languages': 'linguagens',
+'Languages': 'Linguagens',
 'languages updated': 'linguagens atualizadas',
+'Last name': 'Sobrenome',
+'Last Revision': 'Last Revision',
+'Last saved on:': 'Salvo em:',
+'License for': 'Licença para',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': 'carregando...',
+'Local Apps': 'Local Apps',
 'locals': 'locals',
+'Locals##debug': 'Locals##debug',
 'login': 'inicio de sessão',
+'Login': 'Entrar',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'Entrar na interface adminitrativa',
+'Login/Register': 'Login/Register',
+'Logout': 'finalizar sessão',
+'Lost Password': 'Senha perdida',
+'lost password': 'lost password',
+'Main Menu': 'Main Menu',
+'Manage': 'Manage',
 'manage': 'gerenciar',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
 'merge': 'juntar',
 'models': 'modelos',
+'Models': 'Modelos',
+'Modified On': 'Modified On',
+'Modules': 'Módulos',
 'modules': 'módulos',
+'Multi User Mode': 'Multi User Mode',
+'Name': 'Nome',
 'new application "%s" created': 'nova aplicação "%s" criada',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
+'New application wizard': 'Assistente para novas aplicações ',
 'new plugin installed': 'novo plugin instalado',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'Novo registro',
 'new record inserted': 'novo registro inserido',
+'New simple application': 'Nova aplicação básica',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': 'próximos 100 registros',
+'NO': 'NÃO',
+'no changes': 'no changes',
+'No databases in this application': 'Não existem bancos de dados nesta aplicação',
+'No Interaction yet': 'No Interaction yet',
 'no match': 'não encontrado',
+'no package selected': 'nenhum pacote selecionado',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'online designer': 'online designer',
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Ou Obtenha do URL:',
 'or import from csv file': 'ou importar de um arquivo CSV',
 'or provide app url:': 'ou forneça a url de uma aplicação:',
 'or provide application url:': 'ou forneça a url de uma aplicação:',
+'Origin': 'Origem',
+'Original/Translation': 'Original/Tradução',
+'Overview': 'Overview',
+'Overwrite installed app': 'sobrescrever aplicação instalada',
+'Pack all': 'criar pacote',
+'Pack compiled': 'criar pacote compilado',
+'Pack custom': 'Pack custom',
 'pack plugin': 'empacotar plugin',
+'PAM authenticated user, cannot change password here': 'usuario autenticado por PAM, não pode alterar a senha por aqui',
+'Password': 'Senha',
 'password changed': 'senha alterada',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Visualizando arquivo',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" eliminado',
+'Plugin "%s" in application': 'Plugin "%s" na aplicação',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
 'plugins': 'plugins',
+'Plugins': 'Plugins',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Este site utiliza',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': '100 registros anteriores',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Consulta:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Read': 'Read',
+'Record': 'Record',
 'record': 'registro',
 'record does not exist': 'o registro não existe',
 'record id': 'id do registro',
+'Record ID': 'ID do Registro',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Register': 'Registrar-se',
+'Registration key': 'Chave de registro',
+'Reload routes': 'Reload routes',
+'Remove compiled': 'eliminar compilados',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Substituir',
+'Replace All': 'Substituir Tudo',
+'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Arquivo de resolução de conflito',
 'response': 'response',
+'restart': 'restart',
 'restore': 'restaurar',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'reverter',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Papel',
+'Roles': 'Roles',
+'Rows in table': 'Registros na tabela',
+'Rows in Table': 'Rows in Table',
+'Rows selected': 'Registros selecionados',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'A correr em %s',
+'Save': 'Save',
 'save': 'salvar',
+'Save file:': 'Gravar ficheiro:',
+'Save file: %s': 'Gravar ficheiro: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Gravar via Ajax',
+'Saved file hash:': 'Hash do arquivo salvo:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'selecionado(s)',
 'session': 'session',
 'session expired': 'sessão expirada',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'Terminal',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': 'site',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': 'alguns arquicos não puderam ser removidos',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Start searching',
+'Start wizard': 'iniciar assistente',
 'state': 'estado',
+'Static': 'Static',
 'static': 'estáticos',
+'Static files': 'Arquivos estáticos',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
 'submit': 'enviar',
+'Submit': 'Submit',
+'successful': 'successful',
+'Sure you want to delete this object?': 'Tem certeza que deseja apaagr este objeto?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'tabela',
+'Table': 'Table',
+'Table name': 'Nome da tabela',
+'Temporary': 'Temporary',
 'test': 'testar',
+'Testing application': 'Testando a aplicação',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'A "consulta" é uma condição como "db.tabela.campo1==\'valor\'". Algo como "db.tabela1.campo1==db.tabela2.campo2" resulta em um JOIN SQL.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'A lógica da aplicação, cada URL é mapeada para uma função exposta pelo controlador',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'the data representation, define database tables and sets': 'A representação dos dadps, define tabelas e estruturas de dados',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
 'the presentations layer, views are also known as templates': 'A camada de apresentação, As visões também são chamadas de templates',
+'Theme': 'Theme',
+'There are no controllers': 'Não existem controllers',
+'There are no models': 'Não existem modelos',
+'There are no modules': 'Não existem módulos',
+'There are no plugins': 'There are no plugins',
+'There are no private files': '',
+'There are no static files': 'Não existem arquicos estáticos',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': 'Não há traduções, somente a linguagem padrão é suportada',
+'There are no views': 'Não existem visões',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'Estes arquivos são servidos sem processamento, suas imagens ficam aqui',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'Este é o template %(filename)s',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Ticket',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Data Atual',
+'TM': 'MR',
 'to  previous version.': 'para a versão anterior.',
+'To create a plugin, name a file/folder plugin_[name]': 'Para criar um plugin, nomeio um arquivo/pasta como plugin_[nome]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
 'translation strings for the application': 'textos traduzidos para a aplicação',
+'Translation strings for the application': 'Translation strings for the application',
 'try': 'tente',
 'try something like': 'tente algo como',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Não é possível checar as atualizações',
 'unable to create application "%s"': 'não é possível criar a aplicação "%s"',
 'unable to delete file "%(filename)s"': 'não é possível criar o arquico "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'não é possível criar o plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download': 'Não é possível efetuar o download',
+'Unable to download app': 'Não é possível baixar a aplicação',
+'Unable to download app because:': 'Não é possível baixar a aplicação porque:',
+'Unable to download because': 'Não é possível baixar porque',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'não é possível analisar o arquivo CSV',
 'unable to uninstall "%s"': 'não é possível instalar "%s"',
 'unable to upgrade because "%s"': 'não é possível atualizar porque "%s"',
 'uncheck all': 'desmarcar todos',
+'Uninstall': 'desinstalar',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'atualizar',
 'update all languages': 'atualizar todas as linguagens',
+'Update:': 'Atualizar:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'atualize o web2py agora',
 'upload': 'upload',
+'Upload': 'Upload',
+'Upload & install packed application': 'Faça upload e instale uma aplicação empacotada',
+'Upload a package:': 'Faça upload de um pacote:',
+'Upload and install packed application': 'Upload and install packed application',
 'upload application:': 'Fazer upload de uma aplicação:',
+'Upload existing application': 'Faça upload de uma aplicação existente',
 'upload file:': 'Enviar arquivo:',
 'upload plugin file:': 'Enviar arquivo de plugin:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, y ~(...) para NOT, para criar consultas mais complexas.',
+'Use an url:': 'Use uma url:',
+'User': 'User',
+'User ID': 'ID do Usuario',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variáveis',
+'Version': 'Versão',
+'Versioning': 'Versioning',
 'versioning': 'versionamento',
 'view': 'visão',
+'Views': 'Visões',
 'views': 'visões',
-'web2py Recent Tweets': 'Tweets Recentes de @web2py',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py está atualizado',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'Tweets Recentes de @web2py',
+'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py atualizado; favor reiniciar',
+'Welcome to web2py': 'Bem-vindo ao web2py',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'SIM',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/ru.py

@@ -1,86 +1,150 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'ru',
 '!langname!': 'Русский',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"Update" ist ein optionaler Ausdruck wie "Feld1 = \'newvalue". JOIN Ergebnisse können nicht aktualisiert oder gelöscht werden',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s %%{строкa} %%{удаленa}',
 '%s %%{row} updated': '%s %%{строкa} %%{обновленa}',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '(requires internet access)': '(требует подключения к интернету)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(наподобие "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01Searching: **%s** %%{file}': 'Найдено: **%s** %%{файл}',
 'A new version of web2py is available': 'Доступна новая версия web2py',
 'A new version of web2py is available: %s': 'Доступна новая версия web2py: %s',
 'Abort': 'Отмена',
 'About': 'О',
 'About application': 'О приложении',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
 'additional code for your application': 'добавочный код для вашего приложения',
 'Additional code for your application': 'Допольнительный код для вашего приложения',
+'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'админка отключена, потому что отсутствует пароль администратора',
+'admin disabled because not supported on google app engine': 'admin disabled because not supported on google app engine',
 'admin disabled because not supported on google apps engine': 'админка отключена, т.к. не поддерживается на google app engine',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'админка отключена, т.к. невозможно получить доступ к файлу с паролями ',
 'Admin is disabled because insecure channel': 'Админпанель выключена из-за небезопасного соединения',
 'Admin is disabled because unsecure channel': 'Админпанель выключен из-за небезопасного соединения',
 'Admin language': 'Язык админпанели',
+'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'интерфейс администратора',
 'Administrator Password:': 'Пароль администратора:',
 'and rename it (required):': 'и переименуйте его (необходимо):',
 'and rename it:': ' и переименуйте его:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'Appadmin отключен, т.к. соединение не безопасно',
+'Application': 'Application',
 'application "%s" uninstalled': 'Приложение "%s" удалено',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
 'application compiled': 'Приложение скомпилировано',
+'Application exists already': 'Application exists already',
 'application is compiled and cannot be designed': 'Приложение скомпилировано и дизайн не может быть изменен',
 'Application name:': 'Название приложения:',
+'Application updated via git pull': 'Application updated via git pull',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Вы действительно хотите удалить файл "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'Are you sure you want to uninstall application "%s"': 'Вы действительно хотите удалить приложение "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Вы действительно хотите удалить приложение "%s"?',
 'Are you sure you want to upgrade web2py now?': 'Вы действительно хотите обновить web2py сейчас?',
+'Are you sure?': 'Are you sure?',
 'arguments': 'аргументы',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ВНИМАНИЕ: Для входа требуется бесопасное (HTTPS) соединение либо запуск на localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ВНИМАНИЕ: Тестирование не потокобезопасно, поэтому не запускайте несколько тестов параллельно.',
 'ATTENTION: This is an experimental feature and it needs more testing.': 'ВНИМАНИЕ: Это экспериментальная возможность и требует тестирования.',
 'ATTENTION: you cannot edit the running application!': 'ВНИМАНИЕ: Вы не можете редактировать работающее приложение!',
 'Authentication': 'Аутентификация',
+'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Доступные базы данных и таблицы',
+'Available Databases and Tables': 'Available Databases and Tables',
 'back': 'назад',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
 'beautify': 'Раскрасить',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
 'cache': 'кэш',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
 'cache, errors and sessions cleaned': 'Кэш, ошибки и сессии очищены',
 'call': 'вызов',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
 'Cannot be empty': 'Не может быть пустым',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Невозможно компилировать: в приложении присутствуют ошибки. Отладьте его, исправьте ошибки и попробуйте заново.',
+'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
 'cannot create file': 'Невозможно создать файл',
 'cannot upload file "%(filename)s"': 'Невозможно загрузить файл "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Изменить пароль администратора',
+'change editor settings': 'change editor settings',
 'Change Password': 'Изменить пароль',
 'change password': 'изменить пароль',
+'Changelog': 'Changelog',
 'check all': 'проверить все',
 'Check for upgrades': 'проверить обновления',
 'Check to delete': 'Поставьте для удаления',
 'Checking for upgrades...': 'Проверка обновлений...',
 'Clean': 'Очистить',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
 'click here for online examples': 'нажмите здесь для онлайн примеров',
 'click here for the administrative interface': 'нажмите здесь для интерфейса администратора',
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'нажмите для проверки обновления',
 'Client IP': 'IP клиента',
 'code': 'код',
+'Code listing': 'Code listing',
 'collapse/expand all': 'свернуть/развернуть все',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'Компилировать',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'скомпилированное приложение удалено',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controller': 'Контроллер',
 'Controllers': 'Контроллеры',
 'controllers': 'контроллеры',
 'Copyright': 'Copyright',
+'Count': 'Count',
 'Create': 'Создать',
 'create file with filename:': 'Создать файл с названием:',
 'create new application:': 'создать новое приложение:',
 'Create new simple application': 'Создать новое простое приложение',
+'Create/Upload': 'Create/Upload',
 'created by': 'создано',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
 'crontab': 'crontab',
 'Current request': 'Текущий запрос',
 'Current response': 'Текущий ответ',
@@ -91,8 +155,11 @@
 'data uploaded': 'дата загрузки',
 'Database': 'База данных',
 'database': 'база данных',
+'Database %s select': 'Database %s select',
 'database %s select': 'Выбор базы данных %s ',
+'Database administration': 'Database administration',
 'database administration': 'администрирование базы данных',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Дата и время',
 'db': 'бд',
 'DB Model': 'Модель БД',
@@ -104,47 +171,89 @@
 'delete plugin': 'удалить плагин',
 'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
 'Delete:': 'Удалить:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
 'Deploy': 'Развернуть',
 'Deploy on Google App Engine': 'Развернуть на Google App Engine',
 'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
 'Description': 'Описание',
+'Description:': 'Description:',
 'design': 'дизайн',
 'DESIGN': 'ДИЗАЙН',
 'Design for': 'Дизайн для',
 'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
 'direction: ltr': 'направление: ltr',
+'directory not found': 'directory not found',
 'Disable': 'Disable',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'docs',
+'Docs': 'Docs',
 'documentation': 'документация',
 'done!': 'выполнено!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
 'download layouts': 'загрузить шаблоны',
+'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'загрузить плагины',
+'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'E-mail',
 'EDIT': 'ПРАВКА',
 'Edit': 'Правка',
+'edit all': 'edit all',
 'Edit application': 'Правка приложения',
 'edit controller': 'правка контроллера',
+'edit controller:': 'edit controller:',
 'Edit current record': 'Правка текущей записи',
 'Edit Profile': 'Правка профиля',
 'edit profile': 'правка профиля',
 'Edit This App': 'Правка данного приложения',
 'edit views:': 'правка видов:',
+'Editing %s': 'Editing %s',
 'Editing file': 'Правка файла',
 'Editing file "%s"': 'Правка файла "%s"',
 'Editing Language file': 'Правка языкового файла',
 'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'Enterprise Web Framework': 'Enterprise Web Framework',
+'Error': 'Error',
 'Error logs for "%(app)s"': 'Журнал ошибок для "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'Ошибка',
 'escape': 'escape',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Атрибуты объекта исключения',
+'Exit Fullscreen': 'Exit Fullscreen',
 'Expand Abbreviation': 'Раскрыть аббревиатуру',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'Экспорт в CSV',
+'Exports:': 'Exports:',
 'exposes': 'открывает',
+'exposes:': 'exposes:',
 'extends': 'расширяет',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module': 'невозможно загрузить модуль',
+'failed to reload module because:': 'failed to reload module because:',
+'File': 'File',
 'file "%(filename)s" created': 'файл "%(filename)s" создан',
 'file "%(filename)s" deleted': 'файл "%(filename)s" удален',
 'file "%(filename)s" uploaded': 'файл "%(filename)s" загружен',
@@ -152,140 +261,308 @@
 'file "%s" of %s restored': 'файл "%s" из %s восстановлен',
 'file changed on disk': 'файл изменился на диске',
 'file does not exist': 'файл не существует',
+'file not found': 'file not found',
 'file saved on %(time)s': 'файл сохранен %(time)s',
 'file saved on %s': 'файл сохранен %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
 'filter': 'фильтр',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
 'First name': 'Имя',
+'Form has errors': 'Form has errors',
 'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'Функции без doctest будут давать [прошел] в тестах.',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
 'Get from URL:': 'Get from URL:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
 'Go to Matching Pair': 'К подходящей паре',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
 'Group ID': 'ID группы',
 'Hello World': 'Привет, Мир',
 'Help': 'Помощь',
+'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'htmledit',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Если отчет выше содержит номер ошибки, это указывает на ошибку при работе контроллера, до попытки выполнить doctest. Причиной чаще является неверные отступы или ошибки в коде вне функции. \nЗеленый заголовок указывает на успешное выполнение всех тестов. В этом случае результаты тестов не показываются.',
 'If you answer "yes", be patient, it may take a while to download': 'Если вы ответили "Да", потерпите, загрузка может потребовать времени',
 'If you answer yes, be patient, it may take a while to download': 'Если вы ответили "Да", потерпите, загрузка может потребовать времени',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
 'Import/Export': 'Импорт/Экспорт',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'включает',
+'Indent with tabs': 'Indent with tabs',
 'Index': 'Индекс',
 'index': 'index',
 'insert new': 'вставить новый',
 'insert new %s': 'вставить новый %s',
 'inspect attributes': 'inspect attributes',
 'Install': 'Установить',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Установленные приложения',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'внутренняя ошибка',
+'internal error: %s': 'internal error: %s',
 'Internal State': 'Внутренний статус',
 'Invalid action': 'Неверное действие',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'Неверный email',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'неверный пароль',
+'invalid password.': 'invalid password.',
 'Invalid Query': 'Неверный запрос',
 'invalid request': 'неверный запрос',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'неверный тикет',
+'Key': 'Key',
 'Key bindings': 'Комбинации клавиш',
 'Key bindings for ZenConding Plugin': 'Комбинации клавиш для плагина ZenConding',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'Языковой файл "%(filename)s" создан/обновлен',
 'Language files (static strings) updated': 'Языковые файлы (статичные строки) обновлены',
 'languages': 'языки',
 'Languages': 'Языки',
 'languages updated': 'языки обновлены',
 'Last name': 'Фамилия',
+'Last Revision': 'Last Revision',
 'Last saved on:': 'Последнее сохранение:',
 'Layout': 'Верстка',
 'License for': 'Лицензия для',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': 'загрузка...',
+'Local Apps': 'Local Apps',
 'locals': 'locals',
+'Locals##debug': 'Locals##debug',
 'located in the file': 'расположенный в файле',
-'Login': 'Логин',
 'login': 'логин',
+'Login': 'Логин',
+'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Вход в интерфейс администратора',
+'Login/Register': 'Login/Register',
 'Logout': 'выход',
 'Lost Password': 'Забыли пароль',
+'lost password': 'lost password',
 'lost password?': 'Пароль утерян?',
 'Main Menu': 'Главное меню',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
 'Match Pair': 'Найти пару',
+'Memberships': 'Memberships',
 'Menu Model': 'Модель меню',
 'merge': 'объединить',
 'Merge Lines': 'Объединить линии',
 'Models': 'Модели',
 'models': 'модели',
+'Modified On': 'Modified On',
 'Modules': 'Модули',
 'modules': 'модули',
+'Multi User Mode': 'Multi User Mode',
 'Name': 'Название',
 'new application "%s" created': 'новое приложение "%s" создано',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'Мастер нового приложения',
+'new plugin installed': 'new plugin installed',
+'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Новая запись',
 'new record inserted': 'новая запись вставлена',
 'New simple application': 'Новое простое приложение',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': 'следующие 100 строк',
 'Next Edit Point': 'Следующее место правки',
 'NO': 'НЕТ',
+'no changes': 'no changes',
 'No databases in this application': 'В приложении нет базы данных',
+'No Interaction yet': 'No Interaction yet',
+'no match': 'no match',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'или испорт из cvs файла',
 'or provide app url:': 'или URL приложения:',
 'or provide application url:': 'или URL приложения:',
 'Origin': 'Оригинал',
 'Original/Translation': 'Оригинал/Перевод',
+'Overview': 'Overview',
 'Overwrite installed app': 'Переписать на установленное приложение',
 'Pack all': 'упаковать все',
 'Pack compiled': 'Архив скомпилирован',
+'Pack custom': 'Pack custom',
 'pack plugin': 'Упаковать плагин',
 'Password': 'Пароль',
+'password changed': 'password changed',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
 'Peeking at file': 'Просмотр',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
 'please wait!': 'подождите, пожалуйста!',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
+'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
 'Plugin "%s" in application': 'Плагин "%s" в приложении',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
 'plugins': 'плагины',
 'Plugins': 'Плагины',
 'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Обеспечен',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': 'предыдущие 100 строк',
 'Previous Edit Point': 'Предыдущее место правки',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
 'Query:': 'Запрос:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
 'record': 'запись',
 'record does not exist': 'запись не существует',
 'record id': 'id записи',
 'Record ID': 'ID записи',
-'register': 'зарегистрироваться',
+'Record id': 'Record id',
+'refresh': 'refresh',
 'Register': 'Зарегистрироваться',
+'register': 'зарегистрироваться',
 'Registration key': 'Ключ регистрации',
 'Reload routes': 'Reload routes',
 'Remove compiled': 'Удалить скомпилированное',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
 'Reset Password key': 'Сброс пароля',
 'Resolve Conflict file': 'Решить конфликт в файле',
 'response': 'response',
+'restart': 'restart',
 'restore': 'восстановить',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'откатиться',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
 'Role': 'Роль',
+'Roles': 'Roles',
 'Rows in table': 'Строк в таблице',
+'Rows in Table': 'Rows in Table',
 'Rows selected': 'Выбрано строк',
+'rules are not defined': 'rules are not defined',
 'rules:': 'rules:',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
 'Save': 'Save',
 'save': 'сохранить',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
 'Save via Ajax': 'Сохранить через Ajax',
 'Saved file hash:': 'Хэш сохраненного файла:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'выбрано',
 'session': 'session',
 'session expired': 'сессия истекла',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
 'Singular Form': 'Singular Form',
 'Site': 'сайт',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': 'некоторые файлы нельзя удалить',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Start searching',
 'Start wizard': 'запустить мастер',
 'state': 'статус',
+'Static': 'Static',
 'static': 'статичные файлы',
 'Static files': 'Статические файлы',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
 'Stylesheet': 'Таблицы стилей',
 'submit': 'Отправить',
+'Submit': 'Submit',
+'successful': 'successful',
 'Sure you want to delete this object?': 'Действительно хотите удалить данный объект?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'таблица',
+'Table': 'Table',
 'Table name': 'Название таблицы',
+'Temporary': 'Temporary',
 'test': 'тест',
 'test_def': 'test_def',
 'test_for': 'test_for',
@@ -294,6 +571,8 @@
 'Testing application': 'Тест приложения',
 'Testing controller': 'Тест контроллера',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"query" является условием вида "db.table1.field1 == \'значение\'". Что-либо типа "db.table1.field1 db.table2.field2 ==" ведет к SQL JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'Логика приложения, каждый URL отображается в открытую функцию в контроллере',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'Логика приложения, каждый URL отображается к одной функции в контроллере',
 'the data representation, define database tables and sets': 'представление данных, определить таблицы и наборы',
@@ -301,43 +580,77 @@
 'The output of the file is a dictionary that was rendered by the view': 'Выводом файла является словарь, который создан в виде',
 'The presentations layer, views are also known as templates': 'Слой презентации, виды так же известны, как шаблоны',
 'the presentations layer, views are also known as templates': 'слой представления, виды известные так же как шаблоны',
+'Theme': 'Theme',
 'There are no controllers': 'Отсутствуют контроллеры',
 'There are no models': 'Отсутствуют модели',
 'There are no modules': 'Отсутствуют модули',
 'There are no plugins': 'Отсутствуют плагины',
+'There are no private files': 'There are no private files',
 'There are no static files': 'Отсутствуют статичные файлы',
+'There are no translators': 'There are no translators',
 'There are no translators, only default language is supported': 'Отсутствуют переводчики, поддерживается только стандартный язык',
 'There are no views': 'Отсутствуют виды',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'Эти файлы обслуживаются без обработки, ваши изображения попадут сюда',
 'these files are served without processing, your images go here': 'Эти файлы обслуживаются без обработки, ваши изображения попадут сюда',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
 'This is a copy of the scaffolding application': 'Это копия сгенерированного приложения',
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'Это шаблон %(filename)s',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
 'Ticket': 'Тикет',
 'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': 'Время',
 'TM': 'TM',
 'to  previous version.': 'на предыдущую версию.',
 'To create a plugin, name a file/folder plugin_[name]': 'Для создания плагина назовите файл/папку plugin_[название]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
 'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
 'translation strings for the application': 'строки перевода для приложения',
 'Translation strings for the application': 'Строки перевода для приложения',
 'try': 'try',
 'try something like': 'попробовать что-либо вида',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Невозможно проверить обновления',
 'unable to create application "%s"': 'невозможно создать приложение "%s" nicht möglich',
 'unable to delete file "%(filename)s"': 'невозможно удалить файл "%(filename)s"',
+'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
 'Unable to download': 'Невозможно загрузить',
 'Unable to download app': 'Невозможно загрузить',
+'Unable to download app because:': 'Unable to download app because:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'невозможно разобрать файл csv',
 'unable to uninstall "%s"': 'невозможно удалить "%s"',
+'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'снять выбор всего',
 'Uninstall': 'Удалить',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'обновить',
 'update all languages': 'обновить все языки',
 'Update:': 'Обновить:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'обновить web2py сейчас',
 'upload': 'загрузить',
+'Upload': 'Upload',
 'Upload & install packed application': 'Загрузить и установить приложение в архиве',
 'Upload a package:': 'Загрузить пакет:',
 'Upload and install packed application': 'Upload and install packed application',
@@ -348,25 +661,48 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Используйте (...)&(...) для AND, (...)|(...) для OR, и ~(...) для NOT при создании сложных запросов.',
 'Use an url:': 'Используйте url:',
 'user': 'пользователь',
+'User': 'User',
 'User ID': 'ID пользователя',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'переменные',
 'Version': 'Версия',
-'versioning': 'версии',
 'Versioning': 'Versioning',
+'versioning': 'версии',
 'View': 'Вид',
 'view': 'вид',
 'Views': 'Виды',
 'views': 'виды',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
 'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py обновлен',
+'web2py online debugger': 'web2py online debugger',
 'web2py Recent Tweets': 'последние твиты по web2py',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
 'Welcome %s': 'Добро пожаловать, %s',
 'Welcome to web2py': 'Добро пожаловать в web2py',
 'Which called the function': 'Который вызвал функцию',
+'Working...': 'Working...',
 'Wrap with Abbreviation': 'Заключить в аббревиатуру',
+'WSGI reference name': 'WSGI reference name',
 'xml': 'xml',
 'YES': 'ДА',
+'Yes': 'Yes',
 'You are successfully running web2py': 'Вы успешно запустили web2by',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
 'You can modify this application and adapt it to your needs': 'Вы можете изменить это приложение и подогнать под свои нужды',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
 'You visited the url': 'Вы посетили URL',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/sl.py

@@ -1,278 +1,259 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'sl',
 '!langname!': 'Slovenski',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"Popravi" je izbirni izraz kot npr.: "stolpec1 = \'novavrednost\'". Rezultatov JOIN operacije ne morete popravljati ali brisati',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s vrstic izbrisanih',
 '%s %%{row} updated': '%s vrstic popravljeno',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '(requires internet access)': '(zahteva internetni dostop)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(nekaj kot "sl-SI" ali samo "sl")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01Searching: **%s** %%{file}': 'Iskanje: **%s** datoteke',
 'A new version of web2py is available': 'Nova različica web2py je na voljo',
 'A new version of web2py is available: %s': 'Nova različica web2py je na voljo: %s',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'POZOR: Prijava zahteva varno povezavo (HTTPS) ali lokalni (localhost) dostop.',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'POZOR: Testiranje ni večopravilno, zato ne poganjajte več testov hkrati.',
-'ATTENTION: This is an experimental feature and it needs more testing.': 'POZOR: To je preizkusni fazi in potrebuje več testiranja.',
-'ATTENTION: you cannot edit the running application!': 'POZOR: Ne morete urejati aplikacije, ki že teče!',
 'Abort': 'Preklic',
 'About': 'Vizitka',
 'About application': 'O aplikaciji',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
+'additional code for your application': 'dodatna koda za vašo aplikacijo',
 'Additional code for your application': 'Dodatna koda za vašo aplikacijo',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': 'skrbnik izključen, ker ni skrbniškega gesla',
+'admin disabled because not supported on google app engine': 'admin disabled because not supported on google app engine',
+'admin disabled because not supported on google apps engine': 'skrbnik izključen, ker ni podprt na Google App sistemu',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': 'skrbnik izključen, ker ne morem dostopati do datoteke z gesli',
 'Admin is disabled because insecure channel': 'Skrbnik je izključen zaradi nezavarovane povezave',
 'Admin is disabled because unsecure channel': 'Skrbnik je izključen zaradi nezavarovane povezave',
 'Admin language': 'Skrbniški jezik',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'skrbniški vmesnik',
 'Administrator Password:': 'Skrbniško geslo:',
+'and rename it (required):': 'in jo preimenujte (obvezno):',
+'and rename it:': ' in jo preimenujte:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'Appadmin izključen, ker zahteva varno (HTTPS) povezavo',
+'Application': 'Application',
+'application "%s" uninstalled': 'Aplikacija "%s" odstranjena',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'aplikacija prevedena',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': 'aplikacija je prevedena in je ne morete popravljati',
 'Application name:': 'Ime aplikacije:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Ali res želite pobrisati datoteko "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
 'Are you sure you want to delete this object?': 'Ali res želite izbrisati ta predmet?',
 'Are you sure you want to uninstall application "%s"': 'Ali res želite odstraniti program "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Ali res želite odstraniti program "%s"?',
 'Are you sure you want to upgrade web2py now?': 'Ali želite sedaj nadgraditi web2py?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'argumenti',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'POZOR: Prijava zahteva varno povezavo (HTTPS) ali lokalni (localhost) dostop.',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'POZOR: Testiranje ni večopravilno, zato ne poganjajte več testov hkrati.',
+'ATTENTION: This is an experimental feature and it needs more testing.': 'POZOR: To je preizkusni fazi in potrebuje več testiranja.',
+'ATTENTION: you cannot edit the running application!': 'POZOR: Ne morete urejati aplikacije, ki že teče!',
 'Authentication': 'Avtentikacija',
+'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Podatkovne baze in tabele',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'nazaj',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'beautify': 'olepšaj',
 'Begin': 'Začni',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'predpomnilnik',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': 'Predpomnilnik, napake in seja so očiščeni',
+'call': 'kliči',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
 'Cannot be empty': 'Ne sme biti prazno',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Nemogoče prevajanje: napake v programu. Odpravite napake in poskusite ponovno.',
-'Change Password': 'Spremeni geslo',
+'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
+'cannot create file': 'ne morem ustvariti datoteke',
+'cannot upload file "%(filename)s"': 'ne morem naložiti datoteke "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Spremenite skrbniško geslo',
+'change editor settings': 'change editor settings',
+'Change Password': 'Spremeni geslo',
+'change password': 'spremeni geslo',
+'Changelog': 'Changelog',
+'check all': 'označi vse',
 'Check for upgrades': 'Preveri za posodobitve',
 'Check to delete': 'Odkljukajte, če želite izbrisati',
 'Checking for upgrades...': 'Preverjam posodobitve...',
 'Clean': 'Počisti',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
+'click here for online examples': 'kliknite za spletne primere',
+'click here for the administrative interface': 'kliknite za skrbniški vmesnik',
 'Click row to expand traceback': 'Kliknite vrstico da razširite sledenje',
 'Click row to view a ticket': 'Kliknite vrstico za ogled listka',
+'click to check for upgrades': 'kliknite za preverjanje nadgradenj',
 'Client IP': 'IP klienta',
+'code': 'koda',
+'Code listing': 'Code listing',
+'collapse/expand all': 'zapri/odpri vse',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'Prevedi',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': 'prevedena aplikacija je odstranjena',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controller': 'Krmilnik',
 'Controllers': 'Krmilniki',
+'controllers': 'krmilniki',
 'Copyright': 'Copyright',
 'Count': 'Število',
 'Create': 'Ustvari',
+'create file with filename:': 'Ustvari datoteko z imenom:',
+'create new application:': 'Ustvari novo aplikacijo:',
 'Create new simple application': 'Ustvari novo enostavno aplikacijo',
+'Create/Upload': 'Create/Upload',
+'created by': 'ustvaril',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': 'crontab',
 'Current request': 'Trenutna zahteva',
 'Current response': 'Trenutni odgovor',
 'Current session': 'Trenutna seja',
-'DB Model': 'Podatkovni model',
-'DESIGN': 'Izgled',
+'currently running': 'trenutno teče',
+'currently saved or': 'trenutno shranjeno ali',
+'customize me!': 'Spremeni me!',
+'data uploaded': 'podatki naloženi',
 'Database': 'Podatkovna baza',
+'database': 'podatkovna baza',
+'Database %s select': 'Database %s select',
+'database %s select': 'izberi podatkovno bazo %s ',
+'Database administration': 'Database administration',
+'database administration': 'upravljanje s podatkovno bazo',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Datum in čas',
+'db': 'db',
+'DB Model': 'Podatkovni model',
+'Debug': 'Debug',
+'defines tables': 'definiraj tabele',
 'Delete': 'Izbriši',
+'delete': 'izbriši',
+'delete all checked': 'izbriši vse označene',
+'delete plugin': 'izbriši vtičnik',
 'Delete this file (you will be asked to confirm deletion)': 'Izbriši to datoteko (izbris boste morali potrditi)',
 'Delete:': 'Izbriši:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
 'Deploy': 'Namesti',
 'Deploy on Google App Engine': 'Prenesi na Google App sistem',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
 'Description': 'Opis',
+'Description:': 'Description:',
+'design': 'oblikuj',
+'DESIGN': 'Izgled',
 'Design for': 'Oblikuj za',
 'Detailed traceback description': 'Natačen opis sledenja',
+'details': 'podrobnosti',
+'direction: ltr': 'smer: ltr',
+'directory not found': 'directory not found',
 'Disable': 'Izključi',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
+'documentation': 'dokumentacija',
+'done!': 'Narejeno!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
+'download layouts': 'prenesi postavitev',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'prenesi vtičnik',
+'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'E-mail',
 'EDIT': 'UREDI',
 'Edit': 'Uredi',
-'Edit Profile': 'Uredi profil',
-'Edit This App': 'Uredi ta program',
+'edit all': 'edit all',
 'Edit application': 'Uredi program',
+'edit controller': 'uredi krmilnik',
+'edit controller:': 'edit controller:',
 'Edit current record': 'Uredi trenutni zapis',
-'Editing Language file': 'Uredi jezikovno datoteko',
+'Edit Profile': 'Uredi profil',
+'edit profile': 'uredi profil',
+'Edit This App': 'Uredi ta program',
+'edit views:': 'urejaj poglede:',
+'Editing %s': 'Editing %s',
 'Editing file': 'Urejanje datoteke',
 'Editing file "%s"': 'Urejanje datoteke "%s"',
+'Editing Language file': 'Uredi jezikovno datoteko',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error': 'Napaka',
 'Error logs for "%(app)s"': 'Dnevnik napak za "%(app)s"',
 'Error snapshot': 'Posnetek napake',
 'Error ticket': 'Listek napake',
 'Errors': 'Napake',
-'Exception instance attributes': 'Lastnosti instance izjeme',
-'Expand Abbreviation': 'Razširi okrajšave',
-'File': 'Datoteka',
-'First name': 'Ime',
-'Frames': 'Okvirji',
-'Functions with no doctests will result in [passed] tests.': 'Funkcije brez doctest bodo opravile teste brez preverjanja.',
-'Get from URL:': 'Naloži iz URL:',
-'Go to Matching Pair': 'Pojdi k ujemalnemu paru',
-'Group ID': 'ID skupine',
-'Hello World': 'Pozdravljen, Svet!',
-'Help': 'Pomoč',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Če poročilo zgoraj vsebuje številko listka to pomeni napako pri izvajanju krmilnika, še preden so se izvedli doctesti. To ponavadi pomeni napako pri zamiku programske vrstice ali izven funkcije.\nZelen naslov označuje, da so vsi testi opravljeni. V tem primeru testi niso prikazani.',
-'If you answer "yes", be patient, it may take a while to download': 'Če odgovorite z "DA", potrpite. Prenos traja nekaj časa',
-'If you answer yes, be patient, it may take a while to download': 'Če odgovorite z "DA", potrpite. Prenos traja nekaj časa',
-'Import/Export': 'Uvoz/Izvoz',
-'Index': 'Indeks',
-'Install': 'Namesti',
-'Installed applications': 'Nameščene aplikacije',
-'Internal State': 'Notranje stanje',
-'Invalid Query': 'Napačno povpraševanje',
-'Invalid action': 'Napačno dejanje',
-'Invalid email': 'Napačen e-naslov',
-'Key bindings': 'Povezave tipk',
-'Key bindings for ZenConding Plugin': 'Povezave tipk za ZenConding vtičnik',
-'Language files (static strings) updated': 'Jezikovna datoteka (statično besedilo) posodobljeno',
-'Languages': 'Jeziki',
-'Last name': 'Priimek',
-'Last saved on:': 'Zadnjič shranjeno:',
-'Layout': 'Postavitev',
-'License for': 'Licenca za',
-'Login': 'Prijava',
-'Login to the Administrative Interface': 'Prijava v skrbniški vmesnik',
-'Logout': 'Odjava',
-'Lost Password': 'Izgubljeno geslo',
-'Main Menu': 'Glavni meni',
-'Match Pair': 'Ujemalni par',
-'Menu Model': 'Model menija',
-'Merge Lines': 'Združi vrstice',
-'Models': 'Modeli',
-'Modules': 'Moduli',
-'NO': 'NE',
-'Name': 'Ime',
-'New Application Wizard': 'Čarovnik za novo aplikacijo',
-'New Record': 'Nov zapis',
-'New application wizard': 'Čarovnik za novo aplikacijo',
-'New simple application': 'Nova enostavna aplikacija',
-'Next Edit Point': 'Naslednja točka urejanja',
-'No databases in this application': 'V tem programu ni podatkovnih baz',
-'Origin': 'Izvor',
-'Original/Translation': 'Izvor/Prevod',
-'Overwrite installed app': 'Prepiši obstoječi program',
-'Pack all': 'Zapakiraj vse',
-'Pack compiled': 'Paket preveden',
-'Password': 'Geslo',
-'Peeking at file': 'Vpogled v datoteko',
-'Plugin "%s" in application': 'Vtičnik "%s" v aplikaciji',
-'Plugins': 'Vtičniki',
-'Powered by': 'Narejeno z',
-'Previous Edit Point': 'Prejšnja točka urejanja',
-'Query:': 'Vprašanje:',
-'Record ID': 'ID zapisa',
-'Register': 'Registracija',
-'Registration key': 'Registracijski ključ',
-'Reload routes': 'Ponovno naloži preusmeritve',
-'Remove compiled': 'Odstrani prevedeno',
-'Reset Password key': 'Ponastavi ključ gesla',
-'Resolve Conflict file': 'Datoteka za razrešitev problemov',
-'Role': 'Vloga',
-'Rows in table': 'Vrstic v tabeli',
-'Rows selected': 'Izbranih vrstic',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Poženi teste v tej datoteki (za vse teste uporabite gumb 'test')",
-'Save via Ajax': 'Shrani preko AJAX',
-'Saved file hash:': 'Koda shranjene datoteke:',
-'Site': 'Spletišče',
-'Sorry, could not find mercurial installed': 'Oprostite. Mercurial ni nameščen.',
-'Start a new app': 'Začnite z novo aplikacijo',
-'Start wizard': 'Zaženi čarovnika',
-'Static files': 'Statične datoteke',
-'Stylesheet': 'CSS datoteka',
-'Sure you want to delete this object?': 'Ali res želite izbrisati ta predmet?',
-'TM': 'TM',
-'Table name': 'Ime tabele',
-'Testing application': 'Testiranje programa',
-'Testing controller': 'Testiranje krmilnika',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"vprašanje" je pogoj kot npr. "db.table1.field1 == \'vrednost\'". Nekaj kot "db.table1.field1 == db.table2.field2" izvede SQL operacijo JOIN.',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika delovanja aplikacije. Vsak URL je povezan z eno objavljeno funkcijo v krmilniku',
-'The data representation, define database tables and sets': 'Predstavitev podatkov. Definirajte podatkovne tabele in množice',
-'The output of the file is a dictionary that was rendered by the view': 'Rezultat datoteke je slovar, ki ga predela pogled',
-'The presentations layer, views are also known as templates': 'Predstavitveni nivo. Pogledi so znani tudi kot predloge',
-'There are no controllers': 'Ni krmilnikov',
-'There are no models': 'Ni modelov',
-'There are no modules': 'Ni modulov',
-'There are no plugins': 'Ni vtičnikov',
-'There are no static files': 'Ni statičnih datotek',
-'There are no translators, only default language is supported': 'Ni prevodov. Podprt je samo privzeti jezik',
-'There are no views': 'Ni pogledov',
-'These files are served without processing, your images go here': 'Te datoteke so poslane brez obdelave. Vaše slike shranite tu.',
-'This is a copy of the scaffolding application': 'To je kopija okvirne aplikacije',
-'This is the %(filename)s template': 'To je predloga %(filename)s',
-'Ticket': 'Listek',
-'Ticket ID': 'ID listka',
-'Timestamp': 'Časovni žig',
-'To create a plugin, name a file/folder plugin_[name]': 'Če želite ustvariti vtičnik, poimenujte datoteko/mapo plugin_[ime]',
-'Traceback': 'Sledljivost',
-'Translation strings for the application': 'Prevajalna besedila za aplikacijo',
-'Unable to check for upgrades': 'Ne morem preveriti posodobitev',
-'Unable to download': 'Ne morem prenesti datoteke',
-'Unable to download app': 'Ne morem prenesti programa',
-'Uninstall': 'Odstrani',
-'Update:': 'Posodobitev:',
-'Upload & install packed application': 'Naloži in namesti pakirano aplikacijo',
-'Upload a package:': 'Naloži paket:',
-'Upload and install packed application': 'Naloži in namesti pakirano aplikacijo',
-'Upload existing application': 'Naloži obstoječo aplikacijo',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Uporabie (...)&(...) za AND, (...)|(...) za OR, in ~(...) za NOT pri gradnji kompleksnih povpraševanj.',
-'Use an url:': 'Uporabite URL:',
-'User ID': 'ID uporabnika',
-'Version': 'Različica',
-'Versioning': 'Versioning',
-'View': 'Pogled',
-'Views': 'Pogledi',
-'Web Framework': 'Web Framework',
-'Welcome %s': 'Dobrodošli, %s',
-'Welcome to web2py': 'Dobrodošli v web2py',
-'Which called the function': 'Ki je klical funkcijo',
-'Wrap with Abbreviation': 'Ovij z okrajšavo',
-'YES': 'DA',
-'You are successfully running web2py': 'Uspešno ste pognali web2py',
-'You can modify this application and adapt it to your needs': 'Lahko spremenite to aplikacijo in jo prilagodite vašim potrebam',
-'You visited the url': 'Obiskali ste URL',
-'additional code for your application': 'dodatna koda za vašo aplikacijo',
-'admin disabled because no admin password': 'skrbnik izključen, ker ni skrbniškega gesla',
-'admin disabled because not supported on google apps engine': 'skrbnik izključen, ker ni podprt na Google App sistemu',
-'admin disabled because unable to access password file': 'skrbnik izključen, ker ne morem dostopati do datoteke z gesli',
-'administrative interface': 'skrbniški vmesnik',
-'and rename it (required):': 'in jo preimenujte (obvezno):',
-'and rename it:': ' in jo preimenujte:',
-'appadmin': 'appadmin',
-'appadmin is disabled because insecure channel': 'Appadmin izključen, ker zahteva varno (HTTPS) povezavo',
-'application "%s" uninstalled': 'Aplikacija "%s" odstranjena',
-'application compiled': 'aplikacija prevedena',
-'application is compiled and cannot be designed': 'aplikacija je prevedena in je ne morete popravljati',
-'arguments': 'argumenti',
-'back': 'nazaj',
-'beautify': 'olepšaj',
-'cache': 'predpomnilnik',
-'cache, errors and sessions cleaned': 'Predpomnilnik, napake in seja so očiščeni',
-'call': 'kliči',
-'cannot create file': 'ne morem ustvariti datoteke',
-'cannot upload file "%(filename)s"': 'ne morem naložiti datoteke "%(filename)s"',
-'change password': 'spremeni geslo',
-'check all': 'označi vse',
-'click here for online examples': 'kliknite za spletne primere',
-'click here for the administrative interface': 'kliknite za skrbniški vmesnik',
-'click to check for upgrades': 'kliknite za preverjanje nadgradenj',
-'code': 'koda',
-'collapse/expand all': 'zapri/odpri vse',
-'compiled application removed': 'prevedena aplikacija je odstranjena',
-'controllers': 'krmilniki',
-'create file with filename:': 'Ustvari datoteko z imenom:',
-'create new application:': 'Ustvari novo aplikacijo:',
-'created by': 'ustvaril',
-'crontab': 'crontab',
-'currently running': 'trenutno teče',
-'currently saved or': 'trenutno shranjeno ali',
-'customize me!': 'Spremeni me!',
-'data uploaded': 'podatki naloženi',
-'database': 'podatkovna baza',
-'database %s select': 'izberi podatkovno bazo %s ',
-'database administration': 'upravljanje s podatkovno bazo',
-'db': 'db',
-'defines tables': 'definiraj tabele',
-'delete': 'izbriši',
-'delete all checked': 'izbriši vse označene',
-'delete plugin': 'izbriši vtičnik',
-'design': 'oblikuj',
-'details': 'podrobnosti',
-'direction: ltr': 'smer: ltr',
-'documentation': 'dokumentacija',
-'done!': 'Narejeno!',
-'download layouts': 'prenesi postavitev',
-'download plugins': 'prenesi vtičnik',
-'edit controller': 'uredi krmilnik',
-'edit profile': 'uredi profil',
-'edit views:': 'urejaj poglede:',
 'escape': 'escape',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Lastnosti instance izjeme',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation': 'Razširi okrajšave',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'izvozi kot CSV',
+'Exports:': 'Exports:',
 'exposes': 'objavlja',
+'exposes:': 'exposes:',
 'extends': 'razširja',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module': 'nisem uspel ponovno naložiti modula',
+'failed to reload module because:': 'failed to reload module because:',
+'File': 'Datoteka',
 'file "%(filename)s" created': 'datoteka "%(filename)s" ustvarjena',
 'file "%(filename)s" deleted': 'datoteka "%(filename)s" izbrisana',
 'file "%(filename)s" uploaded': 'datoteka "%(filename)s" prenešena',
@@ -280,89 +261,447 @@
 'file "%s" of %s restored': 'datoteka "%s" od %s obnovljena',
 'file changed on disk': 'datoteka je bila spremenjena',
 'file does not exist': 'datoteka ne obstaja',
+'file not found': 'file not found',
 'file saved on %(time)s': 'datoteka shranjena %(time)s',
 'file saved on %s': 'datoteka shranjena %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
 'filter': 'fiter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'First name': 'Ime',
+'Form has errors': 'Form has errors',
+'Frames': 'Okvirji',
+'Functions with no doctests will result in [passed] tests.': 'Funkcije brez doctest bodo opravile teste brez preverjanja.',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
+'Get from URL:': 'Naloži iz URL:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'Go to Matching Pair': 'Pojdi k ujemalnemu paru',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Group ID': 'ID skupine',
+'Hello World': 'Pozdravljen, Svet!',
+'Help': 'Pomoč',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'htmledit',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Če poročilo zgoraj vsebuje številko listka to pomeni napako pri izvajanju krmilnika, še preden so se izvedli doctesti. To ponavadi pomeni napako pri zamiku programske vrstice ali izven funkcije.\nZelen naslov označuje, da so vsi testi opravljeni. V tem primeru testi niso prikazani.',
+'If you answer "yes", be patient, it may take a while to download': 'Če odgovorite z "DA", potrpite. Prenos traja nekaj časa',
+'If you answer yes, be patient, it may take a while to download': 'Če odgovorite z "DA", potrpite. Prenos traja nekaj časa',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'Uvoz/Izvoz',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'vključuje',
+'Indent with tabs': 'Indent with tabs',
+'Index': 'Indeks',
 'index': 'indeks',
 'insert new': 'vstavi nov',
 'insert new %s': 'vstavi nov %s',
 'inspect attributes': 'pregled lastnosti',
+'Install': 'Namesti',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': 'Nameščene aplikacije',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'notranja napaka',
+'internal error: %s': 'internal error: %s',
+'Internal State': 'Notranje stanje',
+'Invalid action': 'Napačno dejanje',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Napačen e-naslov',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'napačno geslo',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Napačno povpraševanje',
 'invalid request': 'napačna zahteva',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'napačen kartonček',
+'Key': 'Key',
+'Key bindings': 'Povezave tipk',
+'Key bindings for ZenConding Plugin': 'Povezave tipk za ZenConding vtičnik',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'jezikovna datoteka "%(filename)s" ustvarjena/posodobljena',
+'Language files (static strings) updated': 'Jezikovna datoteka (statično besedilo) posodobljeno',
 'languages': 'jeziki',
+'Languages': 'Jeziki',
 'languages updated': 'jeziki posodobljeni',
+'Last name': 'Priimek',
+'Last Revision': 'Last Revision',
+'Last saved on:': 'Zadnjič shranjeno:',
+'Layout': 'Postavitev',
+'License for': 'Licenca za',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': 'nalaganje...',
+'Local Apps': 'Local Apps',
 'locals': 'locals',
+'Locals##debug': 'Locals##debug',
 'located in the file': 'se nahaja v datoteki',
 'login': 'prijava',
+'Login': 'Prijava',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'Prijava v skrbniški vmesnik',
+'Login/Register': 'Login/Register',
+'Logout': 'Odjava',
+'Lost Password': 'Izgubljeno geslo',
+'lost password': 'lost password',
 'lost password?': 'Izgubljeno geslo?',
+'Main Menu': 'Glavni meni',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Match Pair': 'Ujemalni par',
+'Memberships': 'Memberships',
+'Menu Model': 'Model menija',
 'merge': 'združi',
+'Merge Lines': 'Združi vrstice',
+'Models': 'Modeli',
 'models': 'modeli',
+'Modified On': 'Modified On',
+'Modules': 'Moduli',
 'modules': 'moduli',
+'Multi User Mode': 'Multi User Mode',
+'Name': 'Ime',
 'new application "%s" created': 'ustvarjen nov program "%s"',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'Čarovnik za novo aplikacijo',
+'New application wizard': 'Čarovnik za novo aplikacijo',
+'new plugin installed': 'new plugin installed',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': 'Nov zapis',
 'new record inserted': 'vstavljen nov zapis',
+'New simple application': 'Nova enostavna aplikacija',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': 'naslednjih 100 zapisov',
+'Next Edit Point': 'Naslednja točka urejanja',
+'NO': 'NE',
+'no changes': 'no changes',
+'No databases in this application': 'V tem programu ni podatkovnih baz',
+'No Interaction yet': 'No Interaction yet',
+'no match': 'no match',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'ali uvozi iz CSV datoteke',
 'or provide app url:': 'ali vpišite URL programa:',
 'or provide application url:': 'ali vpišite URL programa:',
+'Origin': 'Izvor',
+'Original/Translation': 'Izvor/Prevod',
+'Overview': 'Overview',
+'Overwrite installed app': 'Prepiši obstoječi program',
+'Pack all': 'Zapakiraj vse',
+'Pack compiled': 'Paket preveden',
+'Pack custom': 'Pack custom',
 'pack plugin': 'zapakiraj vtičnik',
+'Password': 'Geslo',
+'password changed': 'password changed',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Vpogled v datoteko',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
 'please wait!': 'Prosim počakajte!',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
+'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
+'Plugin "%s" in application': 'Vtičnik "%s" v aplikaciji',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
 'plugins': 'vtičniki',
+'Plugins': 'Vtičniki',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Narejeno z',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': 'prejšnjih 100 zapisov',
+'Previous Edit Point': 'Prejšnja točka urejanja',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Vprašanje:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
 'record': 'zapis',
 'record does not exist': 'zapis ne obstaja',
 'record id': 'id zapisa',
+'Record ID': 'ID zapisa',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'Register': 'Registracija',
 'register': 'registracija',
+'Registration key': 'Registracijski ključ',
+'Reload routes': 'Ponovno naloži preusmeritve',
+'Remove compiled': 'Odstrani prevedeno',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
 'request': 'zahteva',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Ponastavi ključ gesla',
+'Resolve Conflict file': 'Datoteka za razrešitev problemov',
 'response': 'odgovor',
+'restart': 'restart',
 'restore': 'obnovi',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'povrni',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Vloga',
+'Roles': 'Roles',
+'Rows in table': 'Vrstic v tabeli',
+'Rows in Table': 'Rows in Table',
+'Rows selected': 'Izbranih vrstic',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Poženi teste v tej datoteki (za vse teste uporabite gumb 'test')",
+'Running on %s': 'Running on %s',
+'Save': 'Save',
 'save': 'shrani',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Shrani preko AJAX',
+'Saved file hash:': 'Koda shranjene datoteke:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'izbrano',
 'session': 'seja',
 'session expired': 'seja pretekla',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'lupina',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': 'Spletišče',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': 'nekaterih datotek se ni dalo izbrisati',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Oprostite. Mercurial ni nameščen.',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Začnite z novo aplikacijo',
+'Start searching': 'Start searching',
+'Start wizard': 'Zaženi čarovnika',
 'state': 'stanje',
+'Static': 'Static',
 'static': 'statično',
+'Static files': 'Statične datoteke',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
+'Stylesheet': 'CSS datoteka',
 'submit': 'pošlji',
+'Submit': 'Submit',
+'successful': 'successful',
+'Sure you want to delete this object?': 'Ali res želite izbrisati ta predmet?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'tabela',
+'Table': 'Table',
+'Table name': 'Ime tabele',
+'Temporary': 'Temporary',
 'test': 'test',
 'test_def': 'test_def',
 'test_for': 'test_for',
 'test_if': 'test_if',
 'test_try': 'test_try',
+'Testing application': 'Testiranje programa',
+'Testing controller': 'Testiranje krmilnika',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"vprašanje" je pogoj kot npr. "db.table1.field1 == \'vrednost\'". Nekaj kot "db.table1.field1 == db.table2.field2" izvede SQL operacijo JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'krmilna logika, vsaka URL pot je preslikana v eno funkcijo v krmilniku',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika delovanja aplikacije. Vsak URL je povezan z eno objavljeno funkcijo v krmilniku',
 'the data representation, define database tables and sets': 'podatkovna predstavitev, definirajte tabele in množice',
+'The data representation, define database tables and sets': 'Predstavitev podatkov. Definirajte podatkovne tabele in množice',
+'The output of the file is a dictionary that was rendered by the view': 'Rezultat datoteke je slovar, ki ga predela pogled',
+'The presentations layer, views are also known as templates': 'Predstavitveni nivo. Pogledi so znani tudi kot predloge',
 'the presentations layer, views are also known as templates': 'predstavitveni nivo, pogledi so tudi znani kot predloge',
+'Theme': 'Theme',
+'There are no controllers': 'Ni krmilnikov',
+'There are no models': 'Ni modelov',
+'There are no modules': 'Ni modulov',
+'There are no plugins': 'Ni vtičnikov',
+'There are no private files': 'There are no private files',
+'There are no static files': 'Ni statičnih datotek',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': 'Ni prevodov. Podprt je samo privzeti jezik',
+'There are no views': 'Ni pogledov',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'Te datoteke so poslane brez obdelave. Vaše slike shranite tu.',
 'these files are served without processing, your images go here': 'te datoteke so poslane brez posredovanja in obdelave, svoje slike shranite tu',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is a copy of the scaffolding application': 'To je kopija okvirne aplikacije',
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'To je predloga %(filename)s',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Listek',
+'Ticket ID': 'ID listka',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Časovni žig',
+'TM': 'TM',
 'to  previous version.': 'na prejšnjo različico.',
+'To create a plugin, name a file/folder plugin_[name]': 'Če želite ustvariti vtičnik, poimenujte datoteko/mapo plugin_[ime]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Sledljivost',
 'translation strings for the application': 'prevodna besedila za program',
+'Translation strings for the application': 'Prevajalna besedila za aplikacijo',
 'try': 'poskusi',
 'try something like': 'poskusite na primer',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Ne morem preveriti posodobitev',
 'unable to create application "%s"': 'ne morem ustvariti programa "%s" ',
 'unable to delete file "%(filename)s"': 'ne morem izbrisati datoteke "%(filename)s"',
+'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download': 'Ne morem prenesti datoteke',
+'Unable to download app': 'Ne morem prenesti programa',
+'Unable to download app because:': 'Unable to download app because:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'ne morem obdelati csv datoteke',
 'unable to uninstall "%s"': 'ne morem odstraniti "%s"',
+'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'odznači vse',
+'Uninstall': 'Odstrani',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'posodobi',
 'update all languages': 'posodobi vse jezike',
+'Update:': 'Posodobitev:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'posodobi web2py',
 'upload': 'naloži',
+'Upload': 'Upload',
+'Upload & install packed application': 'Naloži in namesti pakirano aplikacijo',
+'Upload a package:': 'Naloži paket:',
+'Upload and install packed application': 'Naloži in namesti pakirano aplikacijo',
 'upload application:': 'naloži program:',
+'Upload existing application': 'Naloži obstoječo aplikacijo',
 'upload file:': 'naloži datoteko:',
 'upload plugin file:': 'naloži vtičnik:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Uporabie (...)&(...) za AND, (...)|(...) za OR, in ~(...) za NOT pri gradnji kompleksnih povpraševanj.',
+'Use an url:': 'Uporabite URL:',
 'user': 'uporabnik',
+'User': 'User',
+'User ID': 'ID uporabnika',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'spremenljivke',
+'Version': 'Različica',
+'Versioning': 'Versioning',
 'versioning': 'različice',
+'View': 'Pogled',
 'view': 'pogled',
+'Views': 'Pogledi',
 'views': 'pogledi',
-'web2py Recent Tweets': 'zadnji tviti na web2py',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py je ažuren',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'zadnji tviti na web2py',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome %s': 'Dobrodošli, %s',
+'Welcome to web2py': 'Dobrodošli v web2py',
+'Which called the function': 'Ki je klical funkcijo',
+'Working...': 'Working...',
+'Wrap with Abbreviation': 'Ovij z okrajšavo',
+'WSGI reference name': 'WSGI reference name',
 'xml': 'xml',
+'YES': 'DA',
+'Yes': 'Yes',
+'You are successfully running web2py': 'Uspešno ste pognali web2py',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You can modify this application and adapt it to your needs': 'Lahko spremenite to aplikacijo in jo prilagodite vašim potrebam',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'You visited the url': 'Obiskali ste URL',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/sr-cr.py

@@ -1,212 +1,595 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'sr-cr',
 '!langname!': 'Српски (Ћирилица)',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
+'%s %%{row} deleted': '%s %%{row} је избрисан',
+'%s %%{row} updated': '%s %%{row} је ажуриран',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
 '%Y-%m-%d': '%d-%m-%Y',
 '%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
 '(requires internet access)': '(захтијева приступ интернету)',
-'(something like "it-it")': '(нешто као "it-it")',
+'(requires internet access, experimental)': '(захтијева приступ интернету, експериментално)',
+'(something like "it-it")': '(на примјер "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(датотека **gluon/contrib/plural_rules/%s.py** није пронађена)',
+'Abort': 'Одустани',
 'About': 'Информације',
 'About application': 'О апликацији',
+'Accept Terms': 'Прихватање услова коришћења',
+'Add breakpoint': 'Add breakpoint',
 'Additional code for your application': 'Додатни код за апликацију',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': 'администрација онемогућена јер нема лозинке',
+'admin disabled because not supported on google app engine': 'администрација онемогућена на google app engine',
+'admin disabled because too many invalid login attempts': 'администрација онемогућена због већег броја неуспјелих покушаја',
 'admin disabled because unable to access password file': 'администрација онемогућена јер не могу приступити датотеци са лозинком',
+'Admin is disabled because insecure channel': 'Администрација онемогућена због несигурне везе',
 'Admin language': 'Језик администратора',
-'administrative interface': 'административни интерфејс',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'административно окружење',
 'Administrator Password:': 'Лозинка администратора:',
 'and rename it:': 'и преименуј у:',
+'App does not exist or you are not authorized': 'Апликација не постоји или немате права приступа',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'администрација онемогућена због несигурне везе',
+'Application': 'Апликација',
+'application "%s" uninstalled': 'апликација "%s" је деинсталирана',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'апликација је компајлирана',
+'Application exists already': 'Апликација већ постоји',
+'application is compiled and cannot be designed': 'апликација је компајлирана и не може се даље уређивати',
 'Application name:': 'Назив апликације:',
+'Application updated via git pull': 'Апликација ажурирана преко git pull',
 'are not used': 'није кориштено',
 'are not used yet': 'није још кориштено',
+'Are you sure you want to delete file "%s"?': 'Да ли сте сигурни да желите избрисати датотеку "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Да ли сте сигурни да желите избрисати помоћни модул "%s"?',
 'Are you sure you want to delete this object?': 'Да ли сте сигурни да желите обрисати?',
+'Are you sure you want to uninstall application "%s"?': 'Да ли сте сигурни да желите деинсталирати апликацију "%s"?',
+'Are you sure?': 'Да ли сте сигурни?',
 'arguments': 'arguments',
 'at char %s': 'код слова %s',
 'at line %s': 'на линији %s',
+'ATTENTION:': 'ПАЖЊА:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'ATTENTION: you cannot edit the running application!': 'ПАЖЊА: не можете уређивати покренуту апликацију!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
+'Available Databases and Tables': 'Доступне базе података и табеле',
 'back': 'назад',
+'Back to the plugins list': 'Назад на листу помоћних модула',
+'Back to wizard': 'Back to wizard',
 'Basics': 'Основе',
 'Begin': 'Почетак',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Кеш',
+'cache': 'кеш',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
 'cache, errors and sessions cleaned': 'кеш, грешке и сесије су обрисани',
-'can be a git repo': 'може бити git repo',
+'can be a git repo': 'може бити git репозиторијум',
+'Cancel': 'Откажи',
+'Cannot be empty': 'Не може бити празно',
+'Cannot compile: there are errors in your app:': 'Не могу компајлирати: грешка у апликацији:',
+'cannot create file': 'не могу креирати датотеку',
 'cannot upload file "%(filename)s"': 'не мофу отпремити датотеку "%(filename)s"',
-'Change admin password': 'Промијени лзинку администратора',
+'Change Admin Password': 'Промијени лозинку администратора',
+'Change admin password': 'Промијени лозинку администратора',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
 'check all': 'check all',
 'Check for upgrades': 'Провјери могућност надоградње',
+'Check to delete': 'Check to delete',
 'Checking for upgrades...': 'Провјеравам могућност надоградње...',
 'Clean': 'Прочисти',
+'Clear': 'Обриши',
+'Clear CACHE?': 'Обриши CACHE?',
+'Clear DISK': 'Обриши DISK',
+'Clear RAM': 'Обриши RAM',
 'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
 'code': 'код',
+'Code listing': 'Приказ кода',
 'collapse/expand all': 'сакрити/приказати све',
+'Command': 'Наредба',
+'Comment:': 'Коментар:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'Компајлирај',
+'Compile (all or nothing)': 'Компајлирај (све или ништа)',
+'Compile (skip failed views)': 'Компајлирај (игнориши грешке)',
+'compiled application removed': 'компајлирана апликација је уклоњена',
+'Condition': 'Стање',
+'continue': 'настави',
 'Controllers': 'Контролери',
 'controllers': 'контролери',
-'Count': 'Count',
+'Count': 'Редни број',
 'Create': 'Креирај',
 'create file with filename:': 'Креирај датотеку под називом:',
 'Create rules': 'Креирај правила',
+'Create/Upload': 'Креирај/Преузми',
 'created by': 'израдио',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
 'crontab': 'crontab',
+'Current request': 'Тренутни захтјев',
+'Current response': 'Тренутни одговор',
+'Current session': 'Тренутна сесија',
 'currently running': 'тренутно покренут',
 'currently saved or': 'тренутно сачувано или',
+'data uploaded': 'data uploaded',
+'Database': 'База података',
+'Database %s select': 'Database %s select',
+'Database administration': 'Администрација базе података',
 'database administration': 'администрација базе података',
-'Debug': 'Debug',
+'Database Administration (appadmin)': 'Администрација базе података (appadmin)',
+'Date and Time': 'Датум и вријеме',
+'db': 'db',
+'Debug': 'Отклони грешку',
 'defines tables': 'дефинише табеле',
-'delete': 'обриши',
 'Delete': 'Обриши',
-'delete all checked': 'delete all checked',
-'Delete this file (you will be asked to confirm deletion)': 'Обриши ову даатотеку (бићете упитани за потврду брисања)',
+'delete': 'обриши',
+'delete all checked': 'избриши све означено',
+'delete plugin': 'избриши помоћни модул',
+'Delete this file (you will be asked to confirm deletion)': 'Обриши ову датотеку (бићете упитани за потврду брисања)',
+'Delete:': 'Избриши:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
 'Deploy': 'Постави',
 'Deploy on Google App Engine': 'Постави на Google App Engine',
 'Deploy to OpenShift': 'Постави на OpenShift',
+'Deploy to pythonanywhere': 'Постави на pythonanywhere',
+'Deploy to PythonAnywhere': 'Постави на PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
+'design': 'design',
 'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
 'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
 'Disable': 'Искључи',
+'Disabled': 'Искључено',
+'disabled in demo mode': 'онемогућено у демо моду',
+'disabled in GAE mode': 'онемогућено у GAE моду',
+'disabled in multi user mode': 'онемогућено у вишекорисничком моду',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'документација',
+'Docs': 'Docs',
+'done!': 'done!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Преузми као .w2p',
+'Download as .exe': 'Преузми као .exe',
 'download layouts': 'преузми layouts',
-'download plugins': 'преузми plugins',
-'Edit': 'Уређивање',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'преузми помоћне модуле',
+'Download plugins from repository': 'Преузми помоћне модуле из репозиторијум',
+'Edit': 'Уреди',
 'edit all': 'уреди све',
 'Edit application': 'Уреди апликацију',
 'edit controller': 'уреди контролер',
-'edit views:': 'уреди views:',
+'edit controller:': 'edit controller:',
+'Edit current record': 'Edit current record',
+'edit views:': 'уреди приказ:',
+'Editing %s': 'Уређивање %s',
 'Editing file "%s"': 'Уређивање датотеке "%s"',
 'Editing Language file': 'Уређивање језичке датотеке',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'Error': 'Грешка',
 'Error logs for "%(app)s"': 'Преглед грешака за "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'Грешке',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Exception instance attributes',
+'Exit Fullscreen': 'Exit Fullscreen',
 'Expand Abbreviation': 'Expand Abbreviation',
-'exposes': 'exposes',
-'exposes:': 'exposes:',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
+'export as csv file': 'извези као csv датотеку',
+'Exports:': 'Извози:',
+'exposes': 'приказује',
+'exposes:': 'приказује:',
 'extends': 'проширује',
 'failed to compile file because:': 'нисам могао да компајлирам због:',
+'failed to reload module because:': 'failed to reload module because:',
 'File': 'Датотека',
+'file "%(filename)s" created': 'датотека "%(filename)s" је креирана',
+'file "%(filename)s" deleted': 'датотека "%(filename)s" је избрисана',
+'file "%(filename)s" uploaded': 'датотека "%(filename)s" је отпремљена',
+'file "%s" of %s restored': 'датотека "%s" од %s е враћено у претходно стање',
+'file changed on disk': 'file changed on disk',
 'file does not exist': 'датотека не постоји',
+'file not found': 'датотека није пронађена',
+'file saved on %(time)s': 'file saved on %(time)s',
 'file saved on %s': 'датотека сачувана на %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
 'filter': 'филтер',
 'Find Next': 'Пронађи сљедећи',
 'Find Previous': 'Пронађи претходни',
+'Form has errors': 'Form has errors',
 'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
 'Generate': 'Generate',
 'Get from URL:': 'Преузми са странице:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
 'Go to Matching Pair': 'Go to Matching Pair',
 'go!': 'крени!',
+'Google App Engine Deployment Interface': 'Google App Engine Dинсталационо окружење',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
 'Help': 'Помоћ',
+'here': 'here',
 'Hide/Show Translated strings': 'Сакрити/Приказати преведене ријечи',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'инсталационо окружење',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'укључује',
+'Indent with tabs': 'Indent with tabs',
 'inspect attributes': 'inspect attributes',
 'Install': 'Инсталирај',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Инсталиране апликације',
-'invalid password.': 'погрешна лозинка.',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
+'internal error': 'унутрашња грешка',
+'internal error: %s': 'унутрашња грешка: %s',
+'Internal State': 'Internal State',
+'Invalid action': 'Invalid action',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid git repository specified.': 'Invalid git repository specified.',
+'invalid password': 'Неважећа лозинка',
+'invalid password.': 'неважећа лозинка.',
+'Invalid Query': 'Погрешан упит',
+'invalid request': 'invalid request',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
+'invalid ticket': 'погрешан тикет',
+'Key': 'Key',
 'Key bindings': 'Пречице',
 'Key bindings for ZenCoding Plugin': 'Пречице за ZenCoding Plugin',
+'Keyboard shortcuts': 'Пречице на тастатури',
+'kill process': 'kill process',
+'language file "%(filename)s" created/updated': 'језичка датотека "%(filename)s" је креирана/ажурирана',
 'Language files (static strings) updated': 'Језичке датотеке су ажуриране',
 'languages': 'језици',
 'Languages': 'Језици',
+'Last Revision': 'Last Revision',
 'Last saved on:': 'Посљедња измјена:',
 'License for': 'Лиценца за',
+'License:': 'Лиценца:',
+'Line Nr': 'Line Nr',
+'Line number': 'Линија број',
+'lists by exception': 'прикажи грешке',
+'lists by ticket': 'прикажи тикете',
+'Loading...': 'Преузимам...',
 'loading...': 'преузимам...',
+'Local Apps': 'Локалне апликације',
 'locals': 'locals',
+'Locals##debug': 'Locals##debug',
 'Login': 'Пријава',
-'Login to the Administrative Interface': 'Пријава за административни интерфејс',
-'Logout': 'Излаз',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'Пријава за административно окружење',
+'Login/Register': 'Пријава/Регистрација',
+'Logout': 'Одјава',
+'lost password': 'изгубљена лозинка',
+'Main Menu': 'Главни мени',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
 'Match Pair': 'Match Pair',
+'Memberships': 'Memberships',
+'merge': 'споји',
 'Merge Lines': 'Споји линије',
-'models': 'models',
-'Models': 'Models',
-'Modules': 'Modules',
-'modules': 'modules',
+'Models': 'Модели',
+'models': 'Модели',
+'Modified On': 'Modified On',
+'Modules': 'Модули',
+'modules': 'модули',
+'Multi User Mode': 'Вишекориснички режим рада',
+'new application "%s" created': 'нова апликација "%s" је креирана',
+'new application "%s" imported': 'нова апликација "%s" је увежена',
 'New Application Wizard': 'Чаробњак за нове апликације',
 'New application wizard': 'Чаробњак за нове апликације',
+'new plugin installed': 'нови помоћни модул је инсталиран',
+'New plugin installed: %s': 'Инсталиран нови помоћни модул: %s',
+'New Record': 'Нови запис',
+'new record inserted': 'унешен нови запис',
 'New simple application': 'Нова једноставна апликација',
+'next': 'следећи',
+'next %s rows': 'next %s rows',
 'Next Edit Point': 'Next Edit Point',
+'NO': 'НЕ',
+'no changes': 'нема промјена',
+'No databases in this application': 'Нема базе података у апликацији',
+'No Interaction yet': 'Нема још интеракције',
+'no match': 'нема подударања',
+'no package selected': 'пакет није одабран',
+'no permission to uninstall "%s"': 'немате овлаштење да деинсталирате "%s"',
 'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
+'Node:': 'Node:',
+'Not Authorized': 'Немате овлашћење',
+'Not supported': 'Није подржано',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'онлајн дизајнер',
+'Open new app in new window': 'Отвори нову апликацију у новом прозору',
+'OpenShift Deployment Interface': 'OpenShift инсталационо окружење',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'или алтернативно',
+'Or Get from URL:': 'Or Get from URL:',
+'or import from csv file': 'или увези помоћу csv датотеке',
 'Original/Translation': 'Оргинал/Превод',
-'Overwrite installed app': 'Пребриши постојећу апликацију',
+'Overview': 'Преглед',
+'Overwrite installed app': 'Замјени већ постојећу апликацију',
 'Pack all': 'Запакуј све',
-'Peeking at file': 'Peeking at file',
-'Plugins': 'Plugins',
-'plugins': 'plugins',
+'Pack compiled': 'Запакуј компајлирано',
+'Pack custom': 'Прилагођено паковање',
+'pack plugin': 'запакуј помоћни модул',
+'password changed': 'лозинка је промијењена',
+'Past revisions': 'Претходне корекције',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Преглед датотеке',
+'Permission': 'Дозвола',
+'Permissions': 'Дозволе',
+'Please': 'Молим',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
+'plugin "%(plugin)s" deleted': 'помоћни модул "%(plugin)s" је избрисан',
+'Plugin "%s" in application': 'Помоћни модул "%s" у апликацији',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Страница помоћних модула',
+'plugins': 'помоћни модули',
+'Plugins': 'Помоћни модули',
+'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Омогућио',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'Previous Edit Point': 'Previous Edit Point',
-'Private files': 'Private files',
-'private files': 'private files',
+'Private files': 'Приватне датотеке',
+'private files': 'приватне датотеке',
 'Project Progress': 'Напредак пројекта',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Упит:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
+'record does not exist': 'record does not exist',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
 'Reload routes': 'Обнови преусмјерења',
+'Remove compiled': 'Уклони компајлирано',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Замијени',
 'Replace All': 'Замијени све',
+'Repository (%s)': 'Репозиторијум (%s)',
 'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Resolve Conflict file',
 'response': 'response',
 'restart': 'restart',
 'restore': 'restore',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'revert',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Улога',
+'Roles': 'Улоге',
+'Rows in Table': 'Записи у табели',
+'Rows selected': 'Rows selected',
 'rules are not defined': 'правила нису дефинисана',
 'rules:': 'правила:',
+'Run tests': 'Покрени тестове',
+'Run tests in this file': 'Покрени тестове у датотеци',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Покренути на %s',
 'Save': 'Сачувај',
-'Save via Ajax': 'сачувај via Ajax',
+'Save file:': 'Сачувај датотеку:',
+'Save file: %s': 'Сачувај датотеку: %s',
+'Save model as...': 'Сачувај модел као...',
+'Save via Ajax': 'Сачувај преко Ajax',
 'Saved file hash:': 'Сачувано као хаш:',
+'Screenshot %s': 'Снимак екрана %s',
+'Search': 'Претрага',
+'Select Files to Package': 'Одабери датотеке за паковање',
 'session': 'сесија',
-'session expired': 'сесија истекла',
+'session expired': 'сесија је истекла',
+'Session saved correctly': 'Сесија је уредно сачувана',
+'Session saved on session only': 'Session saved on session only',
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
 'Site': 'Сајт',
-'skip to generate': 'skip to generate',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'прескочи генерисање',
+'some files could not be removed': 'неке датотеке не могу бити уклоњене',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Жалим, mercurial није инсталиран',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
 'Start a new app': 'Покрени нову апликацију',
 'Start searching': 'Покрени претрагу',
 'Start wizard': 'Покрени чаробњака',
+'state': 'state',
+'Static': 'Static',
 'static': 'static',
 'Static files': 'Static files',
+'Statistics': 'Statistics',
 'Step': 'Корак',
+'step': 'kорак',
+'stop': 'stop',
+'submit': 'прихвати',
 'Submit': 'Прихвати',
 'successful': 'успјешан',
+'switch to : db': 'пређи на : db',
+'switch to : filesystem': 'пређи на : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
+'Table': 'Табела',
+'Temporary': 'Temporary',
 'test': 'тест',
 'Testing application': 'Тестирање апликације',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'There are no models': 'There are no models',
-'There are no plugins': 'There are no plugins',
-'There are no private files': 'There are no private files',
+'Theme': 'Табела',
+'There are no controllers': 'Нема контолера',
+'There are no models': 'Нема модела',
+'There are no modules': 'Нема модула',
+'There are no plugins': 'Нема помоћних модула',
+'There are no private files': 'Нема приватних датотека',
+'There are no static files': 'Нема статичних датотека',
+'There are no translators': 'Нема преводиоца',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'Нема преводиоца',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'Ticket ID': 'Ticket ID',
-'Ticket Missing': 'Ticket nedostaje',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Тикет',
+'Ticket ID': 'Тикет ID',
+'Ticket Missing': 'Недостаје тикет',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'to  previous version.': 'на претходну верзију.',
 'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
 'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
 'Translation strings for the application': 'Ријечи у апликацији које треба превести',
-'Try the mobile interface': 'Пробај мобилни интерфејс',
-'try view': 'try view',
+'try something like': 'на примјер',
+'Try the mobile interface': 'Пробај мобилнo окружење',
+'try view': 'пробај приказ',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Не могу да провјерим могућност надоградње',
+'unable to create application "%s"': 'unable to create application "%s"',
+'unable to delete file "%(filename)s"': 'не могу избрисати датотеку "%(filename)s"',
+'unable to delete file plugin "%(plugin)s"': 'не могу избрисати помоћни модул "%(plugin)s"',
+'Unable to determine the line number!': 'Не могу да утврдим број реда!',
+'Unable to download app because:': 'Не могу да преузмем апликацију због:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Не могу да преузмем списак помоћних модула',
+'unable to install plugin "%s"': 'не могу да инсталирам помоћни модул "%s"',
+'unable to parse csv file': 'не могу да расчланим csv датотеку',
+'unable to uninstall "%s"': 'не могу да деинсталирам "%s"',
+'unable to upgrade because "%s"': 'не могу да ажуримам због "%s"',
 'uncheck all': 'uncheck all',
 'Uninstall': 'Деинсталирај',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'ажурирај',
 'update all languages': 'ажурирај све језике',
+'Update:': 'Ажурирај:',
+'Upgrade': 'Надоградња',
+'upgrade now to %s': 'ажуриран на %s',
 'upload': 'Отпреми',
+'Upload': 'Преузми',
 'Upload a package:': 'Преузми пакет:',
 'Upload and install packed application': 'Преузми и инсталирај запаковану апликацију',
 'upload file:': 'преузми датотеку:',
-'upload plugin file:': 'преузми плагин датотеку:',
+'upload plugin file:': 'преузми датотеку помоћног модула:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
+'User': 'Корисник',
+'Username': 'Корисничко име',
+'Users': 'Корисници',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
 'Version': 'Верзија',
 'Version %s.%s.%s (%s) %s': 'Верзија %s.%s.%s (%s) %s',
-'Versioning': 'Versioning',
-'views': 'views',
-'Views': 'Views',
+'Versioning': 'Креирање верзија',
+'Views': 'Прикази',
+'views': 'прикази',
+'Warning!': 'Упозорење!',
+'WARNING:': 'УПОЗОРЕЊЕ:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
 'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py администраторска лозинка',
+'web2py apps to deploy': 'web2py апликација за инсталацију',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py је ажуран',
+'web2py online debugger': 'web2py online debugger',
 'web2py Recent Tweets': 'web2py Recent Tweets',
+'web2py upgrade': 'web2py надоградња',
+'web2py upgraded; please restart it': 'web2py је ажуриран; молим да рестартујете',
+'Working...': 'Извршавам...',
 'Wrap with Abbreviation': 'Wrap with Abbreviation',
+'WSGI reference name': 'WSGI reference name',
+'YES': 'ДА',
+'Yes': 'Да',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/sr-lt.py

@@ -1,212 +1,596 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'sr-lt',
 '!langname!': 'Srpski (Latinica)',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
+'%s %%{row} deleted': '%s %%{row} je izbrisan',
+'%s %%{row} updated': '%s %%{row} je ažuriran',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
 '%Y-%m-%d': '%d-%m-%Y',
 '%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
 '(requires internet access)': '(zahtijeva pristup internetu)',
-'(something like "it-it")': '(nešto kao "it-it")',
+'(requires internet access, experimental)': '(zahtijeva pristup internetu, eksperimentalno)',
+'(something like "it-it")': '(na primjer "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(datoteka **gluon/contrib/plural_rules/%s.py** nije pronađena)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'Abort': 'Odustani',
 'About': 'Informacije',
 'About application': 'O aplikaciji',
+'Accept Terms': 'Prihvatanje uslova korišćenja',
+'Add breakpoint': 'Add breakpoint',
 'Additional code for your application': 'Dodatni kod za aplikaciju',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': 'administracija onemogućena jer nema lozinke',
+'admin disabled because not supported on google app engine': 'administracija onemogućena na google app engine',
+'admin disabled because too many invalid login attempts': 'administracija onemogućena jer zbog većeg broja neuspjelih pokušaja',
 'admin disabled because unable to access password file': 'administracija onemogućena jer ne mogu pristupiti datoteci sa lozinkom',
+'Admin is disabled because insecure channel': 'Administracija onemogućena zbog nesigurne veze',
 'Admin language': 'Jezik administratora',
-'administrative interface': 'administrativni interfejs',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'administrativno okruženje',
 'Administrator Password:': 'Lozinka administratora:',
 'and rename it:': 'i preimenuj u:',
+'App does not exist or you are not authorized': 'Aplikacija ne postoji ili nemate prava pristupa',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'administracija onemogućena zbog nesigurne veze',
+'Application': 'Aplikacija',
+'application "%s" uninstalled': 'aplikacija "%s" je deinstalirana',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': 'aplikacija je kompajlirana',
+'Application exists already': 'Aplikacija već postoji',
+'application is compiled and cannot be designed': 'aplikacija je kompajlirana i ne može se dalje uređivati',
 'Application name:': 'Naziv aplikacije:',
+'Application updated via git pull': 'Aplikacija ažurirana preko git pull',
 'are not used': 'nije korišteno',
 'are not used yet': 'nije još korišteno',
+'Are you sure you want to delete file "%s"?': 'Da li ste sigurni da želite izbrisati datoteku "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Da li ste sigurni da želite izbrisati pomoćni modul "%s"?',
 'Are you sure you want to delete this object?': 'Da li ste sigurni da želite obrisati?',
+'Are you sure you want to uninstall application "%s"?': 'Da li ste sigurni da želite deinstalirati aplikaciju "%s"?',
+'Are you sure?': 'Da li ste sigurni?',
 'arguments': 'arguments',
 'at char %s': 'kod slova %s',
 'at line %s': 'na liniji %s',
+'ATTENTION:': 'PAŽNJA:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'ATTENTION: you cannot edit the running application!': 'ATTENTION: ne možete uređivati pokrenutu aplikaciju!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
+'Available Databases and Tables': 'Dostupne baze podataka i tabele',
 'back': 'nazad',
+'Back to the plugins list': 'Nazad na listu pomoćnih modula',
+'Back to wizard': 'Back to wizard',
 'Basics': 'Osnove',
 'Begin': 'Početak',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Keš',
+'cache': 'keš',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
 'cache, errors and sessions cleaned': 'keš, greške i sesije su obrisani',
-'can be a git repo': 'može biti git repo',
+'can be a git repo': 'može biti git repozitorijum',
+'Cancel': 'Otkaži',
+'Cannot be empty': 'Ne može biti prazno',
+'Cannot compile: there are errors in your app:': 'Ne mogu kompajlirati: greška u aplikaciji:',
+'cannot create file': 'ne mogu kreirati datoteku',
 'cannot upload file "%(filename)s"': 'ne mogu otpremiti datoteku "%(filename)s"',
 'Change admin password': 'Promijeni lozinku administratora',
+'Change Admin Password': 'Promijeni lozinku administratora',
+'change editor settings': 'change editor settings',
+'Changelog': 'Changelog',
 'check all': 'check all',
 'Check for upgrades': 'Provjeri mogućnost nadogradnje',
+'Check to delete': 'Check to delete',
 'Checking for upgrades...': 'Provjeravam mogućnost nadogradnje...',
 'Clean': 'Pročisti',
+'Clear': 'Obriši',
+'Clear CACHE?': 'Obriši CACHE?',
+'Clear DISK': 'Obriši DISK',
+'Clear RAM': 'Obriši RAM',
 'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
 'code': 'kod',
+'Code listing': 'Prikaz koda',
 'collapse/expand all': 'sakriti/prikazati sve',
+'Command': 'Naredba',
+'Comment:': 'Komentar:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'Kompajliraj',
+'Compile (all or nothing)': 'Kompajliraj (sve ili ništa)',
+'Compile (skip failed views)': 'Kompajliraj (ignoriši greške)',
+'compiled application removed': 'kompajlirana aplikacija je uklonjena',
+'Condition': 'Stanje',
+'continue': 'nastavi',
 'Controllers': 'Kontroleri',
 'controllers': 'kontroleri',
-'Count': 'Count',
+'Count': 'Redni broj',
 'Create': 'Kreiraj',
 'create file with filename:': 'Kreiraj datoteku pod nazivom:',
 'Create rules': 'Kreiraj pravila',
+'Create/Upload': 'Kreiraj/Preuzmi',
 'created by': 'izradio',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
 'crontab': 'crontab',
+'Current request': 'Trenutni zahtjev',
+'Current response': 'Trenutni odgovor',
+'Current session': 'Trenutna sesija',
 'currently running': 'trenutno pokrenut',
 'currently saved or': 'trenutno sačuvano ili',
+'data uploaded': 'data uploaded',
+'Database': 'Baza podataka',
+'Database %s select': 'Database %s select',
 'database administration': 'administracija baze podataka',
-'Debug': 'Debug',
+'Database administration': 'Administracija baze podataka',
+'Database Administration (appadmin)': 'Administracija baze podataka (appadmin)',
+'Date and Time': 'Datum i vrijeme',
+'db': 'db',
+'Debug': 'Otkloni grešku',
 'defines tables': 'definiše tabele',
-'delete': 'obriši',
-'Delete': 'Obriši',
-'delete all checked': 'delete all checked',
-'Delete this file (you will be asked to confirm deletion)': 'Obriši ovu datoteku (bićete upitani za potvrdu brisanja)',
+'delete': 'Izbriši',
+'Delete': 'Izbriši',
+'delete all checked': 'izbriši sve označeno',
+'delete plugin': 'izbriši pomoćni modul',
+'Delete this file (you will be asked to confirm deletion)': 'Izbriši ovu datoteku (bićete upitani za potvrdu brisanja)',
+'Delete:': 'Izbriši:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
 'Deploy': 'Postavi',
 'Deploy on Google App Engine': 'Postavi na Google App Engine',
 'Deploy to OpenShift': 'Postavi na OpenShift',
+'Deploy to pythonanywhere': 'Postavi na pythonanywhere',
+'Deploy to PythonAnywhere': 'Postavi na PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
+'design': 'design',
 'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
 'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
 'Disable': 'Isključi',
+'Disabled': 'Isključeno',
+'disabled in demo mode': 'onemogućeno u demo modu',
+'disabled in GAE mode': 'onemogućeno u GAE modu',
+'disabled in multi user mode': 'onemogućeno u višekorisničkom modu',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'Docs': 'Docs',
 'docs': 'dokumentacija',
+'done!': 'done!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Preuzmi kao .w2p',
+'Download as .exe': 'Preuzmi kao .exe',
 'download layouts': 'preuzmi layouts',
-'download plugins': 'preuzmi plugins',
-'Edit': 'Uređivanje',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'preuzmi pomoćne module',
+'Download plugins from repository': 'Preuzmi pomoćne module iz repozitorijum',
+'Edit': 'Uredi',
 'edit all': 'uredi sve',
 'Edit application': 'Uredi aplikaciju',
 'edit controller': 'uredi controller',
-'edit views:': 'uredi views:',
+'edit controller:': 'edit controller:',
+'Edit current record': 'Edit current record',
+'edit views:': 'uredi prikaz:',
+'Editing %s': 'Uređivanje %s',
 'Editing file "%s"': 'Uređivanje datoteke "%s"',
 'Editing Language file': 'Uređivanje jezičke datoteke',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'Error': 'Greška',
 'Error logs for "%(app)s"': 'Pregled grešaka za "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'Greške',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Exception instance attributes',
+'Exit Fullscreen': 'Exit Fullscreen',
 'Expand Abbreviation': 'Expand Abbreviation',
-'exposes': 'exposes',
-'exposes:': 'exposes:',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
+'export as csv file': 'izvezi kao csv datoteku',
+'Exports:': 'Izvozi:',
+'exposes': 'prikazuje',
+'exposes:': 'prikazuje:',
 'extends': 'proširuje',
 'failed to compile file because:': 'nisam mogao da kompajliram zbog:',
+'failed to reload module because:': 'failed to reload module because:',
 'File': 'Datoteka',
+'file "%(filename)s" created': 'datoteka "%(filename)s" je kreirana',
+'file "%(filename)s" deleted': 'datoteka "%(filename)s" je izbrisana',
+'file "%(filename)s" uploaded': 'datoteka "%(filename)s" je otpremljena',
+'file "%s" of %s restored': 'datoteka "%s" od %s je vraćeno u prethodno stanje',
+'file changed on disk': 'file changed on disk',
 'file does not exist': 'datoteka ne postoji',
+'file not found': 'datoteka nije pronađena',
+'file saved on %(time)s': 'file saved on %(time)s',
 'file saved on %s': 'datoteka sačuvana na %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
 'filter': 'filter',
 'Find Next': 'Pronađi sljedeći',
 'Find Previous': 'Pronađi prethodni',
+'Form has errors': 'Form has errors',
 'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
 'Generate': 'Generate',
 'Get from URL:': 'Preuzmi sa stranice:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
 'Go to Matching Pair': 'Go to Matching Pair',
 'go!': 'kreni!',
+'Google App Engine Deployment Interface': 'Google App Engine instalaciono okruženje',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'Graph Model': 'Graph Model',
+'graph model': 'graph model',
 'Help': 'Pomoć',
+'here': 'here',
 'Hide/Show Translated strings': 'Sakriti/Prikazati prevedene riječi',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': 'Uvoz/Izvoz',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'uključuje',
+'Indent with tabs': 'Indent with tabs',
 'inspect attributes': 'inspect attributes',
 'Install': 'Instaliraj',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Instalirane aplikacije',
-'invalid password.': 'pogrešna lozinka.',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
+'internal error': 'unutrašnja greška',
+'internal error: %s': 'unutrašnja greška: %s',
+'Internal State': 'Internal State',
+'Invalid action': 'Invalid action',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid git repository specified.': 'Invalid git repository specified.',
+'invalid password': 'Nevažeća lozinka',
+'invalid password.': 'nevažeća lozinka.',
+'Invalid Query': 'Pogrešan upit',
+'invalid request': 'invalid request',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
+'invalid ticket': 'pogrešan tiket',
+'Key': 'Key',
 'Key bindings': 'Prečice',
-'Key bindings for ZenCoding Plugin': 'Prečice za for ZenCoding Plugin',
+'Key bindings for ZenCoding Plugin': 'Prečice za ZenCoding Plugin',
+'Keyboard shortcuts': 'Prečice na tastaturi',
+'kill process': 'kill process',
+'language file "%(filename)s" created/updated': 'jezička datoteka "%(filename)s" je kreirana/ažurirana',
 'Language files (static strings) updated': 'Jezičke datoteke su ažurirane',
-'languages': 'jezici',
 'Languages': 'Jezici',
+'languages': 'jezici',
+'Last Revision': 'Last Revision',
 'Last saved on:': 'Posljednja izmjena:',
 'License for': 'Licenca za',
+'License:': 'Licenca:',
+'Line Nr': 'Linija broj',
+'Line number': 'Linija broj',
+'lists by exception': 'prikaži greške',
+'lists by ticket': 'prikaži tikete',
+'Loading...': 'Preuzimam...',
 'loading...': 'preuzimam...',
+'Local Apps': 'Lokalne aplikacije',
 'locals': 'locals',
+'Locals##debug': 'Locals##debug',
 'Login': 'Prijava',
-'Login to the Administrative Interface': 'Prijava za administrativni interfejs',
-'Logout': 'Izlaz',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': 'Prijava za administrativno okruženje',
+'Login/Register': 'Prijava/Registracija',
+'Logout': 'Odjava',
+'lost password': 'izgubljena lozinka',
+'Main Menu': 'Glavni meni',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
 'Match Pair': 'Match Pair',
+'Memberships': 'Memberships',
+'merge': 'spoji',
 'Merge Lines': 'Spoji linije',
-'models': 'models',
-'Models': 'Models',
-'Modules': 'Modules',
-'modules': 'modules',
-'New Application Wizard': 'Čarobnjak za nove aplikacije',
+'Models': 'Modeli',
+'models': 'modeli',
+'Modified On': 'Modified On',
+'modules': 'moduli',
+'Modules': 'Moduli',
+'Multi User Mode': 'Višekorisnički režim rada',
+'new application "%s" created': 'nova aplikacija "%s" je kreirana',
+'new application "%s" imported': 'nova aplikacija "%s" je uvežena',
 'New application wizard': 'Čarobnjak za nove aplikacije',
+'New Application Wizard': 'Čarobnjak za nove aplikacije',
+'new plugin installed': 'novi pomoćni modul je instaliran',
+'New plugin installed: %s': 'Instaliran novi pomoćni modul: %s',
+'New Record': 'Novi zapis',
+'new record inserted': 'unešen novi zapis',
 'New simple application': 'Nova jednostavna aplikacija',
+'next': 'sledeći',
+'next %s rows': 'next %s rows',
 'Next Edit Point': 'Next Edit Point',
+'NO': 'NE',
+'no changes': 'nema promjena',
+'No databases in this application': 'Nema baze podataka u aplikaciji',
+'No Interaction yet': 'Nema još interakcije',
+'no match': 'nema podudaranja',
+'no package selected': 'paket nije odabran',
+'no permission to uninstall "%s"': 'nemate ovlaštenje da deinstalirate "%s"',
 'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
+'Node:': 'Node:',
+'Not Authorized': 'Nemate ovlašćenje',
+'Not supported': 'Nije podržano',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'onlajn dizajner',
+'Open new app in new window': 'Otvori novu aplikaciju u novom prozoru',
+'OpenShift Deployment Interface': 'OpenShift instalaciono okruženje',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'ili alternativno',
+'Or Get from URL:': 'Or Get from URL:',
+'or import from csv file': 'ili uvezi pomoću csv datoteke',
 'Original/Translation': 'Original/Prevod',
-'Overwrite installed app': 'Prebriši postojeću aplikaciju',
+'Overview': 'Pregled',
+'Overwrite installed app': 'Zamjeni već postojeću aplikaciju',
 'Pack all': 'Zapakuj sve',
-'Peeking at file': 'Peeking at file',
-'Plugins': 'Plugins',
-'plugins': 'plugins',
+'Pack compiled': 'Zapakuj kompajlirano',
+'Pack custom': 'Prilagođeno pakovanje',
+'pack plugin': 'zapakuj pomoćni modul',
+'password changed': 'lozinka je promijenjena',
+'Past revisions': 'Prethodne korekcije',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': 'Pregled datoteke',
+'Permission': 'Dozvola',
+'Permissions': 'Dozvole',
+'Please': 'Molim',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
+'plugin "%(plugin)s" deleted': 'Pomoćni modul "%(plugin)s" je izbrisan',
+'Plugin "%s" in application': 'Pomoćni modul "%s" u aplikaciji',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Stranica pomoćnih modula',
+'Plugins': 'Pomoćni moduli',
+'plugins': 'pomoćni moduli',
+'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Omogućio',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'Previous Edit Point': 'Previous Edit Point',
-'Private files': 'Private files',
-'private files': 'private files',
+'private files': 'privatne datoteke',
+'Private files': 'Privatne datoteke',
 'Project Progress': 'Napredak projekta',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz biblioteka nije pronađena',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Upit:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
+'record does not exist': 'record does not exist',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
 'Reload routes': 'Obnovi preusmjerenja',
+'Remove compiled': 'Remove compiled',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Zamijeni',
 'Replace All': 'Zamijeni sve',
+'Repository (%s)': 'Repozitorijum (%s)',
 'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Resolve Conflict file',
 'response': 'response',
 'restart': 'restart',
 'restore': 'restore',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'revert',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Uloga',
+'Roles': 'Uloge',
+'Rows in Table': 'Zapisi u tabeli',
+'Rows selected': 'Rows selected',
 'rules are not defined': 'pravila nisu definisana',
 'rules:': 'pravila:',
+'Run tests': 'Pokreni testove',
+'Run tests in this file': 'Pokreni testove u datoteci',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Pokrenuto na %s',
 'Save': 'Sačuvaj',
-'Save via Ajax': 'Sačuvaj via Ajax',
+'Save file:': 'Sačuvaj datoteku:',
+'Save file: %s': 'Sačuvaj datoteku: %s',
+'Save model as...': 'Sačuvaj model kao...',
+'Save via Ajax': 'Sačuvaj preko Ajax',
 'Saved file hash:': 'Sačuvano kao haš:',
+'Screenshot %s': 'Snimak ekrana %s',
+'Search': 'Pretraga',
+'Select Files to Package': 'Odaberi datoteke za pakovanje',
 'session': 'sesija',
-'session expired': 'sesija istekla',
+'session expired': 'sesija je istekla',
+'Session saved correctly': 'Sesija je uredno sačuvana',
+'Session saved on session only': 'Session saved on session only',
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
-'Site': 'Sajt',
-'skip to generate': 'skip to generate',
+'Showing %s to %s of %s %s found': 'Prikazujem %s do %s od %s %s pronađenih',
+'Singular Form': 'Singular Form',
+'Site': 'Početna',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'preskoči generisanje',
+'some files could not be removed': 'neke datoteke ne mogu biti uklonjene',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Žalim, mercurial nije instaliran',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
 'Start a new app': 'Pokreni novu aplikaciju',
 'Start searching': 'Pokreni pretragu',
 'Start wizard': 'Pokreni čarobnjaka',
+'state': 'state',
 'static': 'static',
+'Static': 'Static',
 'Static files': 'Static files',
+'Statistics': 'Statistics',
 'Step': 'Korak',
+'step': 'korak',
+'stop': 'stop',
 'Submit': 'Prihvati',
+'submit': 'prihvati',
 'successful': 'uspješan',
+'switch to : db': 'pređi na : db',
+'switch to : filesystem': 'pređi na : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
+'Table': 'Tabela',
+'Temporary': 'Temporary',
 'test': 'test',
-'Testing application': 'Testing application',
+'Testing application': 'Testiranje aplikacije',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'There are no models': 'There are no models',
-'There are no plugins': 'There are no plugins',
-'There are no private files': 'There are no private files',
+'Theme': 'Teme',
+'There are no controllers': 'Nema kontolera',
+'There are no models': 'Nema modela',
+'There are no modules': 'Nema modula',
+'There are no plugins': 'Nema pomoćnih modula',
+'There are no private files': 'Nema privatnih datoteka',
+'There are no static files': 'Nema statičnih datoteka',
+'There are no translators': 'Nema prevodioca',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'Nema stranica prikaza',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'Ticket ID': 'Ticket ID',
-'Ticket Missing': 'Ticket nedostaje',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': 'Tiket',
+'Ticket ID': 'Tiket ID',
+'Ticket Missing': 'Nedostaje tiket',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'to  previous version.': 'na prethodnu verziju.',
 'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
 'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
 'Translation strings for the application': 'Riječi u aplikaciji koje treba prevesti',
-'Try the mobile interface': 'Probaj mobilni interfejs',
-'try view': 'try view',
+'try something like': 'na primjer',
+'Try the mobile interface': 'Probaj mobilno okruženje',
+'try view': 'probaj prikaz',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Ne mogu da provjerim mogućnost nadogradnje',
+'unable to create application "%s"': 'unable to create application "%s"',
+'unable to delete file "%(filename)s"': 'ne mogu izbrisati datoteku "%(filename)s"',
+'unable to delete file plugin "%(plugin)s"': 'ne mogu izbrisati pomoćni modul "%(plugin)s"',
+'Unable to determine the line number!': 'Ne mogu da utvrdim broj reda!',
+'Unable to download app because:': 'Ne mogu da preuzmem aplikaciju zbog:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Ne mogu da preuzmem spisak pomoćnih modula',
+'unable to install plugin "%s"': 'ne mogu da instaliram pomoćni modul "%s"',
+'unable to parse csv file': 'ne mogu da rasčlanim csv datoteku',
+'unable to uninstall "%s"': 'ne mogu da deinstaliram "%s"',
+'unable to upgrade because "%s"': 'ne mogu da ažurimam zbog "%s"',
 'uncheck all': 'uncheck all',
 'Uninstall': 'Deinstaliraj',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'ažuriraj',
 'update all languages': 'ažuriraj sve jezike',
+'Update:': 'Ažuriraj:',
+'Upgrade': 'Nadogradnja',
+'upgrade now to %s': 'ažuriran na %s',
 'upload': 'Otpremi',
+'Upload': 'Preuzmi',
 'Upload a package:': 'Preuzmi paket:',
 'Upload and install packed application': 'Preuzmi i instaliraj zapakovanu aplikaciju',
 'upload file:': 'preuzmi datoteku:',
-'upload plugin file:': 'preuzmi plugin datoteku:',
-'variables': 'variables',
+'upload plugin file:': 'preuzmi datoteku pomoćnog modula:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
+'User': 'Korisnik',
+'Username': 'Korisničko ime',
+'Users': 'Korisnici',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
+'variables': 'promenljive',
 'Version': 'Verzija',
 'Version %s.%s.%s (%s) %s': 'Verzija %s.%s.%s (%s) %s',
-'Versioning': 'Versioning',
-'views': 'views',
-'Views': 'Views',
+'Versioning': 'Kreiranje verzija',
+'views': 'prikazi',
+'Views': 'Prikazi',
+'Warning!': 'Upozorenje!',
+'WARNING:': 'UPOZORENJE:',
+'WARNING: The following views could not be compiled:': 'WARNING: Sledeći prikazi ne mogu biti kompajlirani:',
 'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py administratorska lozinka',
+'web2py apps to deploy': 'web2py aplikacija za instalaciju',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py je ažuran',
+'web2py online debugger': 'web2py online debugger',
 'web2py Recent Tweets': 'web2py Recent Tweets',
+'web2py upgrade': 'web2py nadogradnja',
+'web2py upgraded; please restart it': 'web2py je ažuriran; molim da restartujete',
+'Working...': 'Izvršavam...',
 'Wrap with Abbreviation': 'Wrap with Abbreviation',
+'WSGI reference name': 'WSGI referentni naziv',
+'YES': 'DA',
+'Yes': 'Da',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/tr.py

@@ -1,29 +1,38 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'tr',
 '!langname!': 'Türkçe',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"güncelleme" ("update") "field1 = \'yenideğer\'" gibi seçeneğe bağlı bir ifadedir. JOIN sonuçlarını silemez veya silemezsiniz.',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s %%{row} silindi',
 '%s %%{row} updated': '%s %%{row} güncellendi',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
 '%Y-%m-%d': '%d-%m-%Y',
 '%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
 '(requires internet access)': '(Internet erişimi gerekir)',
 '(requires internet access, experimental)': '(internet erişimi gerekir, deneysel)',
 '(something like "it-it")': '("it-it" şeklinde birşeyler) ',
+'(version %s)': '(version %s)',
 '1: Setting Parameters': '1: Parametrelerin Yapılandırılması',
+'?': '?',
 '@markmin\x01An error occured, please [[reload %s]] the page': '@markmin\x01Bir hata oluştu, lütfen sayfayı [[reload %s]]',
 "@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "'%s' uygulaması için[[NEWLINE]]Mercurial Sürüm Kontrol Sistemi Arayüzü",
 '@markmin\x01Searching: **%s** %%{file}': '@markmin\x01Aranıyor: **%s** %%{file}',
 'A new version of web2py is available: %s': "web2py'nin yeni sürümü mevcut: %s ",
 'A new version of web2py is available: Version 1.68.2 (2009-10-21 09:59:29)\n': "web2py'nin yeni sürümü mevcut: Sürüm 1.68.2 (2009-10-21 09:59:29)\r\n",
+'Abort': 'Abort',
 'About': 'Hakkında',
 'About application': 'Uygulama hakkında',
+'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Kesme noktası ekle',
 'additional code for your application': 'uygulamanız için fazladan kod',
 'Additional code for your application': 'Uygulamanız için fazladan kod',
 'Admin design page': 'Yönetici tasarım sayfası',
 'admin disabled because no admin password': 'yönetici parolası olmadığından admin etkinsiz',
 'admin disabled because not supported on google app engine': 'Google App Motoru tafaından desteklenmediğinden admin etkinsizleştirildi',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'parola dosyasına erişielemdiğinden admin etkinsizleştirildi',
 'Admin is disabled because insecure channel': 'güvenzis kanal olduğundan admin etkinsizleştirildi',
 'Admin language': 'Admin dilleri',
@@ -32,14 +41,18 @@
 'Administrator Password:': 'Yönetici Parolası:',
 'and rename it (required):': 've yeniden adlandır (gerekli):',
 'and rename it:': 'yeniden adlandır:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'güvenzis kanal olduğundan admin etkinsizleştirildi',
 'Application': 'Uygulama',
 'application "%s" uninstalled': '"%s" uygulaması kaldırıldı',
 'application %(appname)s installed with md5sum: %(digest)s': '%(appname)s uygulaması md5sum %(digest)s ile kuruldu',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
 'application compiled': 'uygulama derlendi',
+'Application exists already': 'Application exists already',
 'application is compiled and cannot be designed': 'uygulama derlenmiş ve tasarlanamaz',
 'Application name:': 'Uygulama adı:',
+'Application updated via git pull': 'Application updated via git pull',
 'are not used': 'kullanılamıyor',
 'are not used yet': 'şimdilik kullanılamıyor',
 'Are you sure you want to delete file "%s"?': '«%s» dosyasını silmek istediğinize emin misiniz?',
@@ -47,20 +60,31 @@
 'Are you sure you want to delete this object?': 'Bu nesneyi silmek istediğinizden emin misiniz?',
 'Are you sure you want to uninstall application "%s"?': '«%s» uygulamasını kaldırmak istediğinizden emin misiniz?',
 'Are you sure you want to upgrade web2py now?': "web2py'yi güncellemek istediğinizden emin misiniz?",
+'Are you sure?': 'Are you sure?',
 'arguments': 'argümanlar',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'UYARI: Giriş günceli bağlantı (HTTPS) gerektirmekte veya yerel makinada çalışılmalıdır.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'UYARI: ÇOKLU TEST GÜVENLİ DEĞİL. BİRDEN ÇOK TESTİ AYNI ANDA YAPMAYIN.',
 'ATTENTION: you cannot edit the running application!': 'UYARI: çalışan uygulamayı düzenleyemezsiniz!',
 'Autocomplete Python Code': 'Python Kodlarını Otomatik Tamamla',
 'Available databases and tables': 'Kullanılabilir veritabanları ve tablolar',
+'Available Databases and Tables': 'Available Databases and Tables',
 'back': 'geri',
+'Back to the plugins list': 'Back to the plugins list',
 'Back to wizard': 'Sihirbaza geri dön',
 'Basics': 'Temeller',
 'Begin': 'Başla',
 'breakpoint': 'kesme noktası',
-'Breakpoints': 'Kesme Noktaları',
 'breakpoints': 'kesme noktaları',
+'Breakpoints': 'Kesme Noktaları',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
 'cache': 'zula',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
 'cache, errors and sessions cleaned': 'zula, hatalar ve oturumlar temizlendi',
 'can be a git repo': 'git deposu olabilir',
 'Cancel': 'Vazgeç',
@@ -69,23 +93,36 @@
 'Cannot compile: there are errors in your app:': 'Derlenemiyor: uygulamanızda hata(lar) var:',
 'cannot create file': 'dosya oluşturulamıyor',
 'cannot upload file "%(filename)s"': '"%(filename)s" dosyalarını yükleyemiyor',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'admin parolasını değiştir',
 'change editor settings': 'düzenleyici ayarlarını değiştir',
+'Changelog': 'Changelog',
 'check all': 'tümünü kontrol et',
 'Check for upgrades': 'Güncellemeleri kontrol et',
 'Check to delete': 'Silmek için kontrok et',
 'Checking for upgrades...': 'Güncellemeler denetleniyor ... ',
 'Clean': 'Temizle',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
 'Click row to expand traceback': 'Takibi genişletmek için satır üzerine tıkla',
+'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'güncellemeleri denetlemek için tıklayın',
 'code': 'kod',
+'Code listing': 'Code listing',
 'collapse/expand all': 'sıkıştır/tümünü aç',
+'Command': 'Command',
 'Comment:': 'Yorum:',
 'Commit': 'Öneri',
 'Commit form': 'Tarafından öneri',
+'Committed files': 'Committed files',
 'Compile': 'Derle',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'derlenmiş uygulama kaldırıldı',
 'Condition': 'Durum',
+'continue': 'continue',
 'Controllers': 'Denetçiler',
 'controllers': 'denetçiler',
 'Count': 'Sayı',
@@ -95,6 +132,9 @@
 'Create new simple application': 'Yeni basit uygulama oluştur',
 'Create/Upload': 'Oluştur/Yükle',
 'created by': 'yazan:',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
 'crontab': 'krontab',
 'Current request': 'Şimdiki istek',
 'Current response': 'Şimdiki yanıt',
@@ -102,10 +142,13 @@
 'currently running': 'şimdiki çalışan',
 'currently saved or': 'şimdiki kaydedilen veya',
 'data uploaded': 'veri yüklendi',
+'Database': 'Database',
 'database': 'veritabı',
+'Database %s select': 'Database %s select',
 'database %s select': '%s veritabanı seçildi',
 'Database administration': 'Veritabanı yönetimi',
 'database administration': 'veritabı yönetimi',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Tarih ve Zaman',
 'db': 'db',
 'Debug': 'Hata Ayıkla',
@@ -117,19 +160,40 @@
 'Delete this file (you will be asked to confirm deletion)': 'Bu dosyayı sil (silmek için onay istenecek)',
 'Delete:': 'Sil:',
 'deleted after first hit': 'ilk vuruşta silinir',
+'Demo': 'Demo',
 'Deploy': 'Yayımla',
 'Deploy on Google App Engine': 'Google App Motorunda Yayınla',
 'Deploy to OpenShift': "OpenShift'e Yayınla ",
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Yayınlama formu',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
 'design': 'tadarla',
 'Detailed traceback description': 'Ayrıntılı nedenin bulma tanımı',
+'details': 'details',
 'direction: ltr': 'yön: ltr',
+'directory not found': 'directory not found',
 'Disable': 'Devre Dışı',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'dokümanlar',
+'Docs': 'Docs',
 'done!': 'bitti!',
+'Downgrade': 'Downgrade',
 'Download .w2p': '.w2p İndir',
+'Download as .exe': 'Download as .exe',
 'download layouts': 'düzenleri indir',
+'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'eklentileri indir',
+'Download plugins from repository': 'Download plugins from repository',
 'EDIT': 'DÜZENLE',
 'Edit': 'Düzenle',
 'edit all': 'tümünü düzenle',
@@ -142,7 +206,12 @@
 'Editing file': 'Dosya düzenleniyor',
 'Editing file "%s"': '"%s" dosyası düzenleniyor ',
 'Editing Language file': 'Dil dosyası düzenleniyor',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
 'Enable': 'Etkinleştir',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'enter a valid email address': 'geçerli e-posta adresi girin',
 'enter a value': 'bir değer girin',
 'enter only letters, numbers, and underscore': 'sadece harf, sayı ve alt çizgi giriniz',
@@ -152,13 +221,18 @@
 'Error snapshot': 'Hata resmi',
 'Error ticket': 'Hata bileti',
 'Errors': 'Hatalar',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Hata durumu özellikleri',
 'Exit Fullscreen': 'Tam Ekrandan Çık',
 'Expand Abbreviation': 'Kısıtlamayı Aç',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'CSV olarak dışa ver',
+'Exports:': 'Exports:',
 'exposes': 'sergileniyor',
 'exposes:': 'sergile:',
 'extends': 'genişlet',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module': 'modül yüklenemedi',
 'failed to reload module because:': 'modü yüklenemedi çünkü:',
 'File': 'Dosya',
@@ -171,13 +245,17 @@
 'file not found': 'dosya bulanamadı',
 'file saved on %(time)s': 'dosyası %(time)s zamanında kaydedildi',
 'file saved on %s': 'dosyası kaydedildi: %s',
+'filename': 'filename',
 'Filename': 'Dosya adı',
+'Files added': 'Files added',
 'filter': 'filtre',
 'Find Next': 'Sonrakini Bul',
 'Find Previous': 'Öncekini Bul',
+'Form has errors': 'Form has errors',
 'Frames': 'Çerçeveler',
 'Functions with no doctests will result in [passed] tests.': '[passed] testlerdeki işlevlerde doctest yok',
 'GAE Email': 'GAE E-postası',
+'GAE Output': 'GAE Output',
 'GAE Password': 'GAE Parolası',
 'Generate': 'Oluştur',
 'Git Pull': 'Git Çek',
@@ -188,79 +266,129 @@
 'Google Application Id': 'Google Uygulama Id',
 'Goto': 'Git',
 'graph model': 'grafik modeli',
+'Graph Model': 'Graph Model',
 'Help': 'Yardım',
+'here': 'here',
 'Hide/Show Translated strings': 'Çevrilmiş cümleleri Gizle/Görüntüle',
+'Highlight current line': 'Highlight current line',
 'Hits': 'Vuruşlar',
 'Home': 'Anasayfa',
 'honored only if the expression evaluates to true': 'sadece deyim doğru sonucunu verirse',
 'htmledit': 'html dğzenleyici',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Doküman testi yapılmadan önce, eğer yukarıdaki rapor bir bilet numarası içeriyorsa bu denetleyici çalıştırılırken bir hata oluşturğunu gösterir. Bu genellikle girinti/çıkıntı (indentation) hatası veya işlev dışındaki bir hatadan kaynaklanır.\nYeşil başlık geçilen tüm testleri (eğer tanımlanmışsa) gösterir. Bu durumda test sonuçları görüntülenmez.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
 'Import/Export': 'İçe/Dışa Aktarıcı',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'içerir',
+'Indent with tabs': 'Indent with tabs',
 'index': 'indeks',
 'insert new': 'yeni ekle',
 'insert new %s': '%s yeni ekle',
 'inspect attributes': 'özellikleri denetleyin',
 'Install': 'Kurucu',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Kurulu uygulamalar',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'dahili hata',
+'internal error: %s': 'internal error: %s',
 'Internal State': 'Dahili Durum',
 'Invalid action': 'Geçersiz eylem',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
 'invalid expression': 'geçersiz ifade',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'Parola geçersiz',
 'invalid password.': 'geçersiz parola.',
 'Invalid Query': 'Geçersiz Sorgu',
 'invalid request': 'geçersiz istek',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'geçersiz bilet',
+'Key': 'Key',
 'Key bindings': 'Anahtarlar',
 'Key bindings for ZenCoding Plugin': 'ZenCoding Eklentisi için anahtarlar',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': '"%(filename)s" dil dosyası/dosyaları güncellendi',
 'Language files (static strings) updated': 'Dil dosyası (statik cümleler) güncellendi',
 'languages': 'diller',
 'Languages': 'Diller',
+'Last Revision': 'Last Revision',
 'Last saved on:': 'Son kaydedilme:',
 'License for': 'için lisanslanmış',
+'License:': 'License:',
 'Line Nr': 'Satır Nr',
 'Line number': 'Satır numarası',
 'lists by exception': 'istisnaya göre sırala',
 'lists by ticket': 'bilete göre sırala',
+'Loading...': 'Loading...',
 'loading...': 'yükleniyor ...',
+'Local Apps': 'Local Apps',
 'locals': 'yereller',
 'Locals##debug': 'Yereller',
 'Login': 'Giriş',
 'login': 'giriş',
+'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Yönetsel Arayüze Giriş\t',
+'Login/Register': 'Login/Register',
 'Logout': 'Çıkış',
+'lost password': 'lost password',
+'Main Menu': 'Main Menu',
 'Manage': 'Yönet',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
 'merge': 'birleştir',
 'Models': 'Modeller',
 'models': 'modeller',
+'Modified On': 'Modified On',
 'Modules': 'Modüller',
 'modules': 'modüller',
+'Multi User Mode': 'Multi User Mode',
 'new application "%s" created': 'yeni uygulama "%s" oluşturuldu',
+'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'Yeni Uygulama Sihirbazı',
 'New application wizard': 'Yeni uygulama sihirbazı',
 'new plugin installed': 'yeni eklenti kuruldu',
+'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Yeni Kayıt',
 'new record inserted': 'yeni kayıt eklendi',
 'New simple application': 'Yeni basit uygulama',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': 'sonraki 100 satır',
 'NO': 'HAYIR',
+'no changes': 'no changes',
 'No databases in this application': 'Bu uygulamada veritabanı yok',
 'No Interaction yet': 'Henüz etkileşim yok',
 'no match': 'eşlenen yok',
 'no package selected': 'hiç paket seçilmemiş',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
 'No ticket_storage.txt found under /private folder': '/private dizininde ticket_storage.txt dosyası bulunamadı',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Not: Eğer github hata kodu 128 durumunu bildiren bir ileti alırsanız, OpenShift hesabınızı ait ssh anahtarının doğru yapılandırıldığından emin olun.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'çevirimiçi tasarlayıcı',
 'Open new app in new window': 'Yeni pencerede yeni uygualama aç',
 'OpenShift Deployment Interface': 'OpenShift Yayınlama Arayüzü',
+'OpenShift Output': 'OpenShift Output',
 'or alternatively': 'veya seçenek olarak',
 'Or Get from URL:': 'Veya şu URL den alın:',
 'or import from csv file': 'veya CSV dsoyasından içerin',
 'or provide app url:': "veya uygulama URL'si verin:",
 'or provide application url:': "veya uygulama URL'si verin:",
 'Original/Translation': 'Orjinal / Çeviri',
+'Overview': 'Overview',
 'Overwrite installed app': 'Kurulu uygulama üzerine yaz',
 'Pack all': 'Tümünü paketle',
 'Pack compiled': 'Derlenenleri paketle',
@@ -268,106 +396,171 @@
 'pack plugin': 'eklentiyi paketle',
 'PAM authenticated user, cannot change password here': 'PAM onaylı kullanıcı, parola buradan değiştirilemiyor',
 'password changed': 'parola değiştirilidi',
+'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'appcfg.py dosyasının patikası',
 'Path to local openshift repo root.': 'Yerel openshift repo kökünün patikası.',
 'Peeking at file': 'Dosya gözetleniyor',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
 'Please': 'Lütfen',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': '"%(plugin)s" eklentisi silindi',
 'Plugin "%s" in application': '"%s" uygulamasında eklenti',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
 'plugins': 'eklentiler',
 'Plugins': 'Eklentiler',
+'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Çoğul-Kipler:',
 'Powered by': 'Yazılım Temeli:',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': 'önceki 100 satır',
 'Private files': 'Özel dosyalar',
 'private files': 'özel dosyalar',
 'Project Progress': 'Proje İlerlemesi',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
 'pygraphviz library not found': 'pygraphviz kütüphanesi yok',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
 'Query:': 'Sorgu: ',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
 'Rapid Search': 'Hızlı Arama',
+'Record': 'Record',
 'record': 'kayıt',
 'record does not exist': 'kayıt bulunamıyor',
 'record id': 'kayıt id',
+'Record id': 'Record id',
 'refresh': 'yeniden yükle',
+'register': 'register',
 'Reload routes': 'Yönelendirmeyi yeniden yükle',
 'Remove compiled': 'Derlemeyi kaldır',
 'Removed Breakpoint on %s at line %s': ' %s üzerindeki kesme noktası %s satırında değiştrildi.',
 'Replace': 'Değiştir',
 'Replace All': 'Tümünü değiştir',
+'Repository (%s)': 'Repository (%s)',
 'request': 'istek',
+'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'python-git gerekyior, fakat kurulu değil',
 'Resolve Conflict file': 'Dosyadaki çakışmayı çöz',
 'response': 'tepki',
 'restart': 'yeniden başla',
 'restore': 'geri al',
+'return': 'return',
+'Revert': 'Revert',
 'revert': 'geri al',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in Table': 'Rows in Table',
 'Rows in table': 'Tablosundaki satırlar',
 'Rows selected': 'Seçilen satırlar',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Bu dosyadaki testleri çalıştırır (tüm dosyaları çalıştırmak için, 'test' etiketli düğmeyi kullanabilirsiniz)",
 'Running on %s': '%s üzerinde çalışıyor',
 'Save': 'Kaydet',
 'save': 'kaydet',
 'Save file:': 'Dosyayı kaydet:',
 'Save file: %s': 'Dosyayı farklı kaydet: %s',
+'Save model as...': 'Save model as...',
 'Save via Ajax': 'Ajax üzerinden kaydet',
 'Saved file hash:': 'Kaydedilen dosyanın parmak izi:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
 'Select Files to Package': 'Paketlenecek Dosyaları Seç',
 'selected': 'seçildi',
 'session': 'oturum',
 'session expired': 'oturum zamanaşımına uğradı',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
 'Set Breakpoint on %s at line %s: %s': "%s'nin %s satırındaki kesme noktasını: %s yap",
 'shell': 'kabuk',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
 'Site': 'Site',
+'Size of cache:': 'Size of cache:',
 'skip to generate': 'oluşturmak için atla',
 'some files could not be removed': 'bazı dosyalar kaldırılamadı',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
 'source : filesystem': 'kaynak : dosyasistemi',
 'Start a new app': 'Yeni uygualama başla',
 'Start searching': 'Aramaya başla',
 'Start wizard': 'Başlatma sihirbazı',
 'state': 'durum',
-'static': 'statik',
 'Static': 'Statik',
+'static': 'statik',
 'Static files': 'Statik dosyalar',
+'Statistics': 'Statistics',
 'Step': 'Basamak',
-'Submit': 'Gönder',
+'step': 'step',
+'stop': 'stop',
 'submit': 'gönder',
+'Submit': 'Gönder',
 'successful': 'başarılı',
 'Sure you want to delete this object?': 'Bu nesneyi silmek istediğinizden emin misiniz? ',
 'switch to : db': 'geç : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'tablo',
+'Table': 'Table',
 'Temporary': 'Geçici',
 'test': 'test',
 'Testing application': 'Uygulama test ediliyor',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"sorgulama" "db.table1.field1==\'değer\'"  şeklinde bir durumu ifade eder. SQL birleştirmede (JOIN) "db.table1.field1==db.table2.field2" şeklindedir.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'uygulama mantığı: her URL denetleyicideki bir işleve eşlenir',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'Uygulama mantığı: her URL denetleyicideki bir işleve eşlenir',
 'the data representation, define database tables and sets': 'veri gösterimi, veritabanı tablolarını ve setlerini tanımla',
 'The data representation, define database tables and sets': 'Veri gösterimi, veritabanı tablolarını ve setlerini tanımla',
 'The presentations layer, views are also known as templates': 'Sunum katmanı, görünümler şablon olarakda biliniyor.',
 'the presentations layer, views are also known as templates': 'sunum katmanı, görünümler şablon olarakda biliniyor.',
+'Theme': 'Theme',
 'There are no controllers': 'Denetçiler yok',
 'There are no models': 'Modeller yok',
 'There are no modules': 'Modüller yok',
 'There are no plugins': 'Eklentiler yok',
 'There are no private files': 'Özel dosyalar yok',
 'There are no static files': 'Statik dosyalar yok',
+'There are no translators': 'There are no translators',
 'There are no translators, only default language is supported': 'Çeviriler, sadeceön tanmlı dil destekleniyor.',
 'There are no views': 'Görünümler yok',
 'These files are not served, they are only available from within your app': 'Bu dosyalar servis yapılmıyor, bunlar sadece uygulamanız içerisinden erişilebilir.',
 'These files are served without processing, your images go here': 'Bu dosyalarda işlem yapılmadan kaydedildi, resimler buraya gidiyor:',
 'these files are served without processing, your images go here': 'bu dosyalarda işlem yapılmadan kaydedildi, resimler buraya gidiyor:',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'Bu şablonlar %(filename)s: ',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "Bu sayfa uygulamanızı OpenShif uygulama reposuna koyar. Uygulamanızın web2py iskeleti ile oluşturulduğunuz ve web2py dosya sisteminizdeki ropoya erişilebileceği varsayılmıştır. Bu işlev web2py'nin çalıştığı ortamda GitPython'e ihtiyaç duyar.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'Bu sayfa uygulamanızı Google App Motoru bilişim bulutuna yükleyecektir. İndeksleri yerel olarak oluştırmanız gerektiğini aklınızda tutun, Google uygulama sunucusunu yerel olarak kurup çalıştırın, aksi halde bazı kayıtlarda hatalar olacaktır. Uyarı: yayınlama ağ hızınıza bağlı olarak uzun zaman alabilir. Uyarı: bu sizin app.yaml dosyasını yeniden yazar. LÜTFEN BİRDEN FAZLA GÖNDERMEYİN.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'bu sayfayı, kesme noktasına geldiğini görmek için ve hata ayıklama etkileşmesi gerekiyor..',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
 'Ticket': 'Bilet',
-'Ticket ID': 'Bile ID\'si',
+'Ticket ID': "Bile ID'si",
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'TM': 'TM',
 'to  previous version.': 'önceki sürüme.',
 'To create a plugin, name a file/folder plugin_[name]': 'Eklenti oluşturmak için dosyayı dosya/klasör plugin_[isim] şeklinde isimlendir. ',
 'To emulate a breakpoint programatically, write:': 'Program ile kesme noktasını öykünmek için, yazın:',
 'to use the debugger!': 'hata ayıklayıcısını kullanmak için!',
 'toggle breakpoint': 'kesme noktasını değiştir',
+'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Tam Ekrana Geç',
 'Traceback': 'Nedenin bul',
 'translation strings for the application': 'uygulama için çeviri cümleleri',
@@ -376,23 +569,33 @@
 'try something like': 'gibi birşey dene',
 'Try the mobile interface': 'Mobil arayüzü dene',
 'try view': 'görünümü dene',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Güncellemeler denetlenemiyor',
 'unable to create application "%s"': '"%s" uygulaması oluşturulamıyor',
 'unable to delete file "%(filename)s"': '"%(filename)s" dosylaları silinemiyor',
 'unable to delete file plugin "%(plugin)s"': '"%(plugin)s" eklenti dosyasyaları silenemiyor',
+'Unable to determine the line number!': 'Unable to determine the line number!',
 'Unable to download': 'İndirilemiyor',
 'Unable to download app': 'Uygulamanız indirilemiyor',
 'Unable to download app because:': 'Uygulamanız indirilemiyor çünkü:',
 'Unable to download because': 'İndirilemiyor çünkü:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': "impossible d'analyser les fichiers CSV",
 'unable to uninstall "%s"': 'kladıramıyor çünkü "%s"',
 'unable to upgrade because "%s"': 'güncelleyemiyor çünkü "%s"',
 'uncheck all': 'tümünü kladır',
 'Uninstall': 'Kaldır',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'güncelle',
 'update all languages': 'tüm delleri yükle',
 'Update:': 'Güncelle:',
+'Upgrade': 'Upgrade',
 'upgrade now': 'şimdi güncelle',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': "web2py'yi güncelle",
 'upload': 'yükle',
 'Upload': 'Yükle',
@@ -406,21 +609,38 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Karmaşık sorgularda Ve (AND) için (...)&(...) kullanın, Veya (OR) için (...)|(...) kullanın ve DEĞİL (NOT) için ~(...) kullanın. ',
 'Use an url:': "Url'yi kullan:",
 'user': 'kullanıcı',
+'User': 'User',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'değişkenler',
 'Version': 'Sürüm',
-'versioning': 'sürümleme',
 'Versioning': 'Sürümleme',
+'versioning': 'sürümleme',
 'view': 'görüntü',
 'Views': 'Görüntüler',
 'views': 'görüntüler',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
 'Web Framework': 'Web Çatısı',
+'web2py Admin Password': 'web2py Admin Password',
 'web2py apps to deploy': 'Yayınlanacak web2py uygulaması',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py güncel',
 'web2py online debugger': 'çevirimiçi web2py hata ayıklayıcı',
 'web2py Recent Tweets': 'web2py Son Twitler',
+'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py güncellendi, lütfen yeniden başlatın',
+'Working...': 'Working...',
 'WSGI reference name': 'WSGI referans ismi',
 'YES': 'EVET',
+'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': '"kesme noktaları" düğmesini kullanarak düzenleme penceresine geçebilir ve kesme nokatalarını hem ekeleyebilir hemde kaldırabilirsiniz',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'Gelinceye kadar kurmalısınız',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/uk.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'uk',
 '!langname!': 'Українська',
@@ -9,12 +9,15 @@
 '%s %%{row} deleted': 'Вилучено %s %%{рядок}',
 '%s %%{row} updated': 'Вилучено %s %%{рядок}',
 '%s Recent Tweets': '%s %%{останній} %%{твіт}',
+'%s selected': '%s selected',
 '%s students registered': '%s студентів зареєстровано',
 '%Y-%m-%d': '%Y/%m/%d',
 '%Y-%m-%d %H:%M:%S': '%Y/%m/%d %H:%M:%S',
 '(requires internet access)': '(потрібно мати доступ в інтернет)',
 '(requires internet access, experimental)': '(потрібно мати доступ в інтернет, експериментально)',
 '(something like "it-it")': '(щось схоже на "uk-ua")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(не існує файлу **gluon/contrib/plural_rules/%s.py**)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'Сталась помилка, будь-ласка [[переватажте %s]] сторінку',
 "@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Інтерфейс системи контролю версій Mercurial[[NEWLINE]]для додатку '%s'",
@@ -23,17 +26,21 @@
 'About': 'Про',
 'about': 'про',
 'About application': 'Про додаток',
+'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Додати точку зупинки',
 'Additional code for your application': 'Додатковий код для вашого додатку',
+'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'адмін.інтерфейс відключено, бо не вказано пароль адміністратора',
 'admin disabled because not supported on google app engine': 'адмін.інтерфейс відключено через те, що Google Application Engine його не підтримує',
 'admin disabled because too many invalid login attempts': 'адмін.інтерфейс заблоковано, бо кількість хибних спроб входу перевищило граничний рівень',
 'admin disabled because unable to access password file': 'адмін.інтерфейс відключено через відсутність доступу до файлу паролів',
 'Admin is disabled because insecure channel': "Адмін.інтерфейс відключено через використання ненадійного каналу звя'зку",
 'Admin language': 'Мова інтерфейсу:',
+'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'інтерфейс адміністратора',
 'Administrator Password:': 'Пароль адміністратора:',
 'and rename it:': 'i змінити назву на:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'App does not exist or your are not authorized': 'Додаток не існує, або ви не авторизовані',
 'appadmin': 'Aдм.панель',
 'appadmin is disabled because insecure channel': "адмін.панель відключено через використання ненадійного каналу зв'язку",
@@ -45,12 +52,14 @@
 'Application exists already': 'Додаток вже існує',
 'application is compiled and cannot be designed': 'додаток скомпільований. налаштування змінювати не можна',
 'Application name:': 'Назва додатку:',
+'Application updated via git pull': 'Application updated via git pull',
 'are not used': 'не використовуються',
 'are not used yet': 'поки що не використовуються',
 'Are you sure you want to delete file "%s"?': 'Ви впевнені, що хочете вилучити файл "%s"?',
 'Are you sure you want to delete plugin "%s"?': 'Ви впевнені, що хочете вилучити втулку "%s"?"',
 'Are you sure you want to delete this object?': "Ви впевнені, що хочете вилучити цей об'єкт?",
 'Are you sure you want to uninstall application "%s"?': 'Ви впевнені, що хочете вилучити (uninstall) додаток "%s"?',
+'Are you sure?': 'Are you sure?',
 'arguments': 'аргументи',
 'at char %s': 'на символі %s',
 'at line %s': 'в рядку %s',
@@ -60,7 +69,10 @@
 'ATTENTION: you cannot edit the running application!': 'УВАГА: Ви не можете редагувати додаток, який зараз виконуєте!',
 'Autocomplete Python Code': 'Автозавершення коду на Python',
 'Available databases and tables': 'Доступні бази даних та таблиці',
+'Available Databases and Tables': 'Available Databases and Tables',
 'back': '<< назад',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
 'bad_resource': 'поганий_ресурс',
 'Basics': 'Початок',
 'Begin': 'Початок',
@@ -69,7 +81,9 @@
 'breakpoints': 'точки зупинок',
 'Bulk Register': 'Масова реєстрація',
 'Bulk Student Registration': 'Масова реєстрація студентів',
+'Cache': 'Cache',
 'cache': 'кеш',
+'Cache Cleared': 'Cache Cleared',
 'Cache Keys': 'Ключі кешу',
 'cache, errors and sessions cleaned': 'кеш, список зареєстрованих помилок та сесії очищенні',
 'can be a git repo': 'може бути git-репозитарієм',
@@ -78,13 +92,16 @@
 'Cannot compile: there are errors in your app:': 'Не вдається скомпілювати: є помилки у вашому додатку:',
 'cannot create file': 'не можу створити файл',
 'cannot upload file "%(filename)s"': 'не можу завантажити файл "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Змінити пароль адміністратора',
 'change editor settings': 'змінити налаштування редактора',
+'Changelog': 'Changelog',
 'check all': 'відмітити всі',
 'Check for upgrades': 'Перевірити оновлення',
 'Check to delete': 'Помітити на вилучення',
 'Checking for upgrades...': 'Відбувається пошук оновлень...',
 'Clean': 'Очистити',
+'Clear': 'Clear',
 'Clear CACHE?': 'Очистити ВЕСЬ кеш?',
 'Clear DISK': 'Очистити ДИСКОВИЙ КЕШ',
 'Clear RAM': "Очистити КЕШ В ПАМ'ЯТІ",
@@ -97,7 +114,10 @@
 'Comment:': 'Пояснення:',
 'Commit': 'Комміт',
 'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': 'Компілювати',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'скомпільований додаток вилучено',
 'Condition': 'Умова',
 'contact_admin': "зв'язатись_з_адміністратором",
@@ -112,7 +132,9 @@
 'Create rules': 'Створити правила',
 'Create/Upload': 'Створити/Завантажити',
 'created by': 'Автор:',
+'Created by:': 'Created by:',
 'Created On': 'Створено в',
+'Created on:': 'Created on:',
 'crontab': 'таблиця cron',
 'Current request': 'Поточний запит',
 'Current response': 'Поточна відповідь',
@@ -120,9 +142,13 @@
 'currently running': 'наразі, активний додаток',
 'currently saved or': 'останній збережений, або',
 'data uploaded': 'дані завантажено',
+'Database': 'Database',
 'database': 'база даних',
+'Database %s select': 'Database %s select',
 'database %s select': 'Вибірка з бази даних %s',
+'Database administration': 'Database administration',
 'database administration': 'адміністрування бази даних',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Дата і час',
 'db': 'база даних',
 'Debug': 'Ладнати (Debug)',
@@ -134,10 +160,15 @@
 'Delete this file (you will be asked to confirm deletion)': 'Вилучити цей файл (буде відображено запит на підтвердження операції)',
 'Delete:': 'Вилучити:',
 'deleted after first hit': 'автоматично вилучається після першого спрацювання',
+'Demo': 'Demo',
 'Deploy': 'Розгорнути',
 'Deploy on Google App Engine': 'Розгорнути на Google App Engine (GAE)',
 'Deploy to OpenShift': 'Розгорнути  на OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Форма розгортання (deployment form)',
+'Deployment Interface': 'Deployment Interface',
+'Description:': 'Description:',
 'design': 'налаштування',
 'Detailed traceback description': 'Детальний опис стеку викликів (traceback)',
 'details': 'детальніше',
@@ -146,14 +177,23 @@
 'Disable': 'Вимкнути',
 'Disabled': 'Вимкнено',
 'disabled in demo mode': 'відключено в демо-режимі',
+'disabled in GAE mode': 'disabled in GAE mode',
 'disabled in multi user mode': 'відключено в багато-користувацькому режимі',
+'DISK': 'DISK',
 'Disk Cache Keys': 'Ключі дискового кешу',
 'Disk Cleared': 'Дисковий кеш очищено',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'док.',
+'Docs': 'Docs',
 'done!': 'зроблено!',
 'Downgrade': 'Повернути попередню версію',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
 'download layouts': 'завантажити макет (layout)',
+'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'завантажити втулки',
+'Download plugins from repository': 'Download plugins from repository',
 'Edit': 'Редагувати',
 'edit all': 'редагувати всі',
 'Edit application': 'Налаштування додатку',
@@ -165,7 +205,11 @@
 'Editing file "%s"': 'Редагується файл "%s"',
 'Editing Language file': 'Редагується файл перекладу',
 'Editing Plural Forms File': 'Редагується файл форм множини',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
 'Enable': 'Увімкнути',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
 'enter a value': 'введіть значення',
 'Error': 'Помилка',
 'Error logs for "%(app)s"': 'Список зареєстрованих помилок додатку "%(app)s"',
@@ -178,7 +222,9 @@
 'Exception instance attributes': 'Атрибути примірника класу Exception (виключення)',
 'Exit Fullscreen': 'Вийти з повноекранного режиму',
 'Expand Abbreviation': 'Розгорнути абревіатуру',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'експортувати як файл csv',
+'Exports:': 'Exports:',
 'exposes': 'обслуговує',
 'exposes:': 'обслуговує:',
 'extends': 'розширює',
@@ -195,10 +241,13 @@
 'file not found': 'файл не знайдено',
 'file saved on %(time)s': 'файл збережено в %(time)s',
 'file saved on %s': 'файл збережено в %s',
+'filename': 'filename',
 'Filename': "Ім'я файлу",
+'Files added': 'Files added',
 'filter': 'фільтр',
 'Find Next': 'Шукати наступний',
 'Find Previous': 'Шукати попередній',
+'Form has errors': 'Form has errors',
 'Frames': 'Стек викликів',
 'Functions with no doctests will result in [passed] tests.': 'Функції, в яких відсутні док-тести відносяться до функцій, які успішно пройшли тести.',
 'GAE Email': 'Ел.пошта GAE',
@@ -215,22 +264,30 @@
 'Google Application Id': 'Ідентифікатор Google Application',
 'Goto': 'Перейти до',
 'graph model': 'графова модель',
+'Graph Model': 'Graph Model',
 'Help': 'Допомога',
+'here': 'here',
 'Hide/Show Translated strings': 'Сховати/показати ВЖЕ ПЕРЕКЛАДЕНІ рядки',
+'Highlight current line': 'Highlight current line',
 'Hits': 'Спрацьовувань',
 'Home': 'Домівка',
 'honored only if the expression evaluates to true': 'точка зупинки активується тільки за істинності умови',
 'If start the downgrade, be patient, it may take a while to rollback': 'Запустивши повернення на попередню версію, будьте терплячими, це може зайняти трохи часу',
 'If start the upgrade, be patient, it may take a while to download': 'Запустивши оновлення, будьте терплячими, потрібен час для завантаження необхідних даних',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Якщо в наданому вище звіті присутня позначка про помилку (ticket number), то це вказує на збій у виконанні контролера ще до початку запуску док-тестів. Це, зазвичай, сигналізує про помилку вирівнювання тексту програми (indention error) або помилку за межами функції (error outside function code).\n\t\tЗелений заголовок сигналізує, що всі тести (з наявних) пройшли успішно. В цьому випадку результат тестів показано не буде.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
 'Import/Export': 'Імпорт/Експорт',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'Під час розробки , використовуйте вбудований веб-сервер Rocket, він найкраще налаштований на спільну роботу з інтерактивним ладначем.',
 'includes': 'включає',
+'Indent with tabs': 'Indent with tabs',
 'index': 'індекс',
 'insert new': 'вставити новий',
 'insert new %s': 'вставити новий %s',
 'inspect attributes': 'інспектувати атрибути',
 'Install': 'Встановлення',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Встановлені додатки (applications)',
 'Interaction at %s line %s': 'Виконується %s рядок %s',
 'Interactive console': 'Інтерактивна консоль',
@@ -238,41 +295,57 @@
 'internal error: %s': 'внутрішня помилка: %s',
 'Internal State': 'Внутрішній стан',
 'Invalid action': 'Помилкова дія',
+'Invalid application name': 'Invalid application name',
 'invalid circual reference': 'помилкове циклічне посилання',
 'invalid circular reference': 'помилкове циклічне посилання',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': 'неправильний пароль',
 'invalid password.': 'неправильний пароль.',
 'Invalid Query': 'Помилковий запит',
 'invalid request': 'хибний запит',
+'Invalid request': 'Invalid request',
 'invalid request ': 'Хибний запит',
 'invalid table names (auth_* tables already defined)': 'хибна назва таблиці (таблиці auth_* вже оголошено)',
 'invalid ticket': 'недійсна позначка про помилку (ticket)',
 'Key': 'Ключ',
 'Key bindings': 'Клавіатурні скорочення:',
 'Key bindings for ZenCoding Plugin': 'Клавіатурні скорочення для втулки ZenCoding plugin',
+'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'вбити процес',
 'language file "%(filename)s" created/updated': 'Файл перекладу "%(filename)s" створено/оновлено',
 'Language files (static strings) updated': 'Файли перекладів (із статичних рядків в першоджерелах) оновлено',
 'languages': 'переклади',
 'Languages': 'Переклади',
+'Last Revision': 'Last Revision',
 'Last saved on:': 'Востаннє збережено:',
 'License for': 'Ліцензія додатку',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
 'Line number': '№ рядка',
 'LineNo': '№ рядка',
 'lists by exception': 'список виключень (exceptions)',
 'lists by ticket': 'список позначок (tickets)',
+'Loading...': 'Loading...',
 'loading...': 'завантаження...',
+'Local Apps': 'Local Apps',
 'locals': 'локальні',
 'Locals##debug': 'Локальні змінні',
 'Login': 'Вхід',
 'login': 'вхід',
+'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Вхід в адміністративний інтерфейс',
+'Login/Register': 'Login/Register',
 'Logout': 'Вихід',
+'lost password': 'lost password',
 'Main Menu': 'Основне меню',
 'Manage': 'Керувати',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
 'Manage Admin Users/Students': 'Адміністратор керування користувачами/студентами',
+'Manage Cache': 'Manage Cache',
 'Manage Students': 'Керувати студентами',
 'Match Pair': 'Знайти пару',
+'Memberships': 'Memberships',
 'merge': "з'єднати",
 'Merge Lines': "З'єднати рядки",
 'Minimum length is %s': 'Мінімальна довжина становить %s',
@@ -281,37 +354,46 @@
 'Modified On': 'Змінено в',
 'Modules': 'Модулі',
 'modules': 'модулі',
+'Multi User Mode': 'Multi User Mode',
 'Must include at least %s %s': 'Має вміщувати щонайменше %s %s',
-'Must include at least %s lower case': 'Повинен включати щонайменше %s малих букв',
+'Must include at least %s lowercase': 'Повинен включати щонайменше %s малих букв',
 'Must include at least %s of the following : %s': 'Має включати не менше %s таких символів : %s',
-'Must include at least %s upper case': 'Повинен включати щонайменше %s великих букв',
+'Must include at least %s uppercase': 'Повинен включати щонайменше %s великих букв',
 'new application "%s" created': 'новий додаток "%s" створено',
+'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'Майстер створення нового додатку',
 'New application wizard': 'Майстер створення нового додатку',
 'new plugin installed': 'нова втулка (plugin) встановлена',
+'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Новий запис',
 'new record inserted': 'новий рядок додано',
 'New simple application': 'Новий простий додаток',
 'next': 'наступний',
+'next %s rows': 'next %s rows',
 'next 100 rows': 'наступні 100 рядків',
 'Next Edit Point': 'Наступне місце редагування',
 'NO': 'НІ',
+'no changes': 'no changes',
 'No databases in this application': 'Даний додаток не використовує бази даних',
 'No Interaction yet': 'Ладнач не активовано',
 'no match': 'співпадань нема',
 'no package selected': 'пакет не вибрано',
 'no permission to uninstall "%s"': 'нема прав на вилучення (uninstall) "%s"',
 'No ticket_storage.txt found under /private folder': 'В каталозі /private відсутній файл ticket_storage.txt',
+'Node:': 'Node:',
 'Not Authorized': 'Не дозволено',
+'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Примітка: Якщо ви отримали повідомлення про помилку з кодом стану github рівним 128, переконайтесь, що система та обліковий запис, з якого відбувається розгортання використовують відповідний ключ ssh, налаштований в обліковому записі openshift.',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": 'У промисловій експлуатації, ви повинні налаштувати ваш веб-сервер на використання одного процесу та багатьох потоків, якщо бажаєте скористатись цим ладначем.',
 'online designer': 'дизайнер БД',
+'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift: Інтерфейс розгортання',
 'OpenShift Output': 'Вивід OpenShift',
 'or alternatively': 'або альтернативно',
 'Or Get from URL:': 'Або Отримати з мережі (ч/з URL):',
 'or import from csv file': 'або імпортувати через csv-файл',
 'Original/Translation': 'Оригінал/переклад',
+'Overview': 'Overview',
 'Overwrite installed app': 'Перезаписати встановлений додаток',
 'Pack all': 'Пакувати все',
 'Pack compiled': 'Пакувати зкомпільоване',
@@ -319,42 +401,62 @@
 'pack plugin': 'запакувати втулку',
 'PAM authenticated user, cannot change password here': 'Ввімкнена система ідентифікації користувачів PAM. Для зміни паролю скористайтесь командами вашої ОС ',
 'password changed': 'пароль змінено',
+'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Шлях до appcfg.py',
 'Path to local openshift repo root.': 'Шлях до локального корня репозитарія openshift.',
 'peek': 'глянути',
 'Peeking at file': 'Перегляд файлу',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
 'Please': 'Будь-ласка',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin': 'втулка',
 'plugin "%(plugin)s" deleted': 'втулку "%(plugin)s" вилучено',
 'Plugin "%s" in application': 'Втулка "%s" в додатку',
 'plugin not specified': 'втулку не визначено',
+'Plugin page': 'Plugin page',
 'plugins': 'втулки (plugins)',
 'Plugins': 'Втулки (Plugins)',
 'Plural Form #%s': 'Форма множини #%s',
 'Plural-Forms:': 'Форми множини:',
 'Powered by': 'Працює на',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': 'попередні 100 рядків',
 'Previous Edit Point': 'Попереднє місце редагування',
 'Private files': 'Приватні файли',
 'private files': 'приватні файли',
 'Project Progress': 'Поступ проекту',
 'Pull': 'Втягнути',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
 'Push': 'Проштовхнути',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
 'Query:': 'Запит:',
+'RAM': 'RAM',
 'RAM Cache Keys': 'Ключ ОЗП-кешу (RAM Cache)',
 'Ram Cleared': "Кеш в пам'яті очищено",
 'Rapid Search': 'Миттєвий пошук',
+'Record': 'Record',
 'record': 'запис',
 'record does not exist': 'запису не існує',
 'record id': 'Ід.запису',
+'Record id': 'Record id',
 'refresh': 'оновіть',
+'register': 'register',
 'reload': 'перевантажити',
 'Reload routes': 'Перезавантажити маршрути',
 'Remove compiled': 'Вилуч.компл',
 'Removed Breakpoint on %s at line %s': 'Вилучено точку зупинки у %s в рядку %s',
 'Replace': 'Замінити',
 'Replace All': 'Замінити все',
+'Repository (%s)': 'Repository (%s)',
 'request': 'запит',
+'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'Для розгортання необхідний пакет python-git, але він не встановлений',
 'resolve': "розв'язати",
 'Resolve Conflict file': "Файл розв'язування конфлікту",
@@ -362,7 +464,14 @@
 'restart': 'перезапустити майстра',
 'restore': 'повернути',
 'return': 'повернутись',
+'Revert': 'Revert',
 'revert': 'відновитись',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in Table': 'Rows in Table',
 'Rows in table': 'Рядків у таблиці',
 'Rows selected': 'Рядків вибрано',
 'rules are not defined': 'правила не визначені',
@@ -376,22 +485,33 @@
 'Save': 'Зберегти',
 'Save file:': 'Зберегти файл:',
 'Save file: %s': 'Зберегти файл: %s',
+'Save model as...': 'Save model as...',
 'Save via Ajax': 'зберегти через Ajax',
 'Saved file hash:': 'Хеш збереженого файлу:',
+'Screenshot %s': 'Screenshot %s',
 'search': 'пошук',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': 'відмічено',
 'session': 'сесія',
 'session expired': 'час даної сесії вичерпано',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
 'Set Breakpoint on %s at line %s: %s': 'Додано точку зупинки в %s на рядок %s: %s',
 'shell': 'консоль',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
 'signup': 'підписатись',
 'signup_requested': 'необхідна_реєстрація',
 'Singular Form': 'Форма однини',
 'site': 'сайт',
 'Site': 'Сайт',
+'Size of cache:': 'Size of cache:',
 'skip to generate': 'перейти до генерування результату',
 'some files could not be removed': 'деякі файли не можна вилучити',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
 'Sorry, could not find mercurial installed': 'Не вдалось виявити встановлену систему контролю версій Mercurial',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
 'Start a new app': 'Створюється новий додаток',
 'Start searching': 'Розпочати пошук',
 'Start wizard': 'Активувати майстра',
@@ -399,6 +519,7 @@
 'Static': 'Статичні',
 'static': 'статичні',
 'Static files': 'Статичні файли',
+'Statistics': 'Statistics',
 'Step': 'Крок',
 'step': 'крок',
 'stop': 'зупинити',
@@ -406,7 +527,10 @@
 'Submit': 'Застосувати',
 'successful': 'успішно',
 'switch to : db': 'перемкнути на : БД',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': 'таблиця',
+'Table': 'Table',
 'tags': 'мітки (tags)',
 'Temporary': 'Тимчасово',
 'test': 'тестувати всі',
@@ -417,6 +541,7 @@
 'The application logic, each URL path is mapped in one exposed function in the controller': 'Логіка додатку, кожний шлях URL проектується на одну з функцій обслуговування в контролері',
 'The data representation, define database tables and sets': 'Представлення даних, опис таблиць БД та наборів',
 'The presentations layer, views are also known as templates': 'Презентаційний рівень, відображення, відомі також як шаблони',
+'Theme': 'Theme',
 'There are no controllers': 'Жодного контролера, наразі, не існує',
 'There are no models': 'Моделей, наразі, нема',
 'There are no modules': 'Модулів поки що нема',
@@ -448,6 +573,7 @@
 'To emulate a breakpoint programatically, write:': 'Для встановлення точки зупинки  програмним чином напишіть:',
 'to use the debugger!': 'щоб активувати ладнач!',
 'toggle breakpoint': '+/- точку зупинки',
+'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Перемкнути на весь екран',
 'Traceback': 'Стек викликів (Traceback)',
 'Translation strings for the application': 'Пари рядків <оригінал>:<переклад> для вибраної мови',
@@ -456,6 +582,7 @@
 'try view': 'дивитись результат',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'наберіть тут будь-які команди ладнача PDB і натисніть клавішу [Return] ([Enter]), щоб запустити їх на виконання.',
 'Type python statement in here and hit Return (Enter) to execute it.': 'Наберіть тут будь-які вирази Python і натисніть клавішу [Return] ([Enter]), щоб запустити їх на виконання.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Неможливо перевірити оновлення',
 'unable to create application "%s"': 'не можу створити додаток "%s"',
 'unable to create application "%s" (it may exist already)': 'не можу створити додаток "%s" (можливо його вже створено)',
@@ -466,7 +593,9 @@
 'Unable to download because:': 'Неможливо завантажити через:',
 'unable to download layout': 'не вдається завантажити макет',
 'unable to download plugin: %s': 'не вдається завантажити втулку: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install application "%(appname)s"': 'не вдається встановити додаток "%(appname)s"',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'не вдається розібрати csv-файл',
 'unable to uninstall "%s"': 'не вдається вилучити "%s"',
 'unable to upgrade because "%s"': 'не вдається оновити, тому що "%s"',
@@ -490,6 +619,9 @@
 'upload plugin file:': 'завантажити файл втулки:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Для створення складних запитів використовуйте (...)&(...) замість AND, (...)|(...) замість OR, та ~(...) замість NOT.',
 'user': 'користувач',
+'User': 'User',
+'Username': 'Username',
+'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Використання оболонки може заблокувати базу даних від сумісного використання іншими користувачами цього додатку.',
 'value not allowed': 'недопустиме значення',
 'variables': 'змінні',
@@ -499,8 +631,11 @@
 'view': 'перегляд',
 'Views': 'Відображення (Views)',
 'views': 'відображення',
+'Warning!': 'Warning!',
 'WARNING:': 'ПОПЕРЕДЖЕННЯ:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
 'Web Framework': 'Веб-каркас (Web Framework)',
+'web2py Admin Password': 'web2py Admin Password',
 'web2py apps to deploy': 'Готові до розгортання додатки web2py',
 'web2py Debugger': 'Ладнач web2py',
 'web2py downgrade': 'повернення на попередню версію web2py',
@@ -509,13 +644,17 @@
 'web2py Recent Tweets': 'Останні твіти web2py',
 'web2py upgrade': 'оновлення web2py',
 'web2py upgraded; please restart it': 'web2py оновлено; будь-ласка перезапустіть його',
+'Working...': 'Working...',
 'Wrap with Abbreviation': 'Загорнути з абревіатурою',
 'WSGI reference name': "ім'я посилання WSGI",
 'YES': 'ТАК',
+'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Ви також можете встановлювати/вилучати точки зупинок під час редагування першоджерел (sources), використовуючи кнопку "+/- точку зупинки"',
+'You can inspect variables using the console bellow': 'Ви можете досліджувати змінні, використовуючи інтерактивну консоль',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
 'You have one more login attempt before you are locked out': 'У вас є ще одна спроба перед тим, як вхід буде заблоковано',
 'you must specify a name for the uploaded application': "ви повинні вказати ім'я додатка, перед ти, як завантажити його",
 'You need to set up and reach a': 'Треба встановити та досягнути',
+'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Ваш додаток буде заблоковано, поки ви не клацнете по одній з кнопок керування ("наступний", "крок", "продовжити", та ін.)',
-'Your can inspect variables using the console bellow': 'Ви можете досліджувати змінні, використовуючи інтерактивну консоль',
 }

applications/admin/languages/zh-tw.py

@@ -1,302 +1,682 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'zh-tw',
 '!langname!': '台灣中文',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"更新" 是選擇性的條件式, 格式就像 "欄位1=\'值\'". 但是 JOIN 的資料不可以使用 update 或是 delete"',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '已刪除 %s 筆',
 '%s %%{row} updated': '已更新 %s 筆',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(格式類似 "zh-tw")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
 'A new version of web2py is available': '新版的 web2py 已發行',
 'A new version of web2py is available: %s': '新版的 web2py 已發行: %s',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': '注意: 登入管理帳號需要安全連線(HTTPS)或是在本機連線(localhost).',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': '注意: 因為在測試模式不保證多執行緒安全性，也就是說不可以同時執行多個測試案例',
-'ATTENTION: you cannot edit the running application!': '注意:不可編輯正在執行的應用程式!',
+'Abort': 'Abort',
 'About': '關於',
 'About application': '關於本應用程式',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
+'additional code for your application': '應用程式額外的程式碼',
+'Additional code for your application': 'Additional code for your application',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': '管理介面關閉原因是沒有設定管理員密碼 ',
+'admin disabled because not supported on google app engine': '管理介面關閉原因是不支援在google apps engine環境下運作',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': '管理介面關閉原因是無法存取密碼檔',
 'Admin is disabled because insecure channel': '管理功能(Admin)在不安全連線環境下自動關閉',
 'Admin is disabled because unsecure channel': '管理功能(Admin)在不安全連線環境下自動關閉',
+'Admin language': 'Admin language',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'administrative interface',
 'Administrator Password:': '管理員密碼:',
+'amy_ajax': 'amy_ajax',
+'and rename it (required):': '同時更名為(必要的):',
+'and rename it:': '同時更名為:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': '應用程式管理員',
+'appadmin is disabled because insecure channel': '管理介面關閉理由是連線方式不安全',
+'Application': 'Application',
+'application "%s" uninstalled': '已移除應用程式 "%s"',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': '已編譯應用程式',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': '應用程式已經編譯無法重新設計',
+'Application name:': 'Application name:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': '確定要刪除檔案"%s"?',
 'Are you sure you want to delete plugin "%s"?': '確定要刪除插件 "%s"?',
+'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'Are you sure you want to uninstall application "%s"': '確定要移除應用程式 "%s"',
 'Are you sure you want to uninstall application "%s"?': '確定要移除應用程式 "%s"',
 'Are you sure you want to upgrade web2py now?': '確定現在要升級 web2py?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': '注意: 登入管理帳號需要安全連線(HTTPS)或是在本機連線(localhost).',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': '注意: 因為在測試模式不保證多執行緒安全性，也就是說不可以同時執行多個測試案例',
+'ATTENTION: you cannot edit the running application!': '注意:不可編輯正在執行的應用程式!',
 'Authentication': '驗證',
+'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': '可提供的資料庫和資料表',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': '回復(back)',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': '快取記憶體',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': '快取記憶體,錯誤紀錄,連線紀錄已清除',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
 'Cannot be empty': '不可空白',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': '無法編譯:應用程式中含有錯誤，請除錯後再試一次.',
 'Cannot compile: there are errors in your app:': '無法編譯: 在你的應用程式存在錯誤:',
-'Change Password': '變更密碼',
+'cannot create file': '無法創建檔案',
+'cannot upload file "%(filename)s"': '無法上傳檔案 "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
+'change editor settings': 'change editor settings',
+'Change Password': '變更密碼',
+'change_password': '變更密碼',
+'Changelog': 'Changelog',
+'check all': '全選',
+'Check for upgrades': 'Check for upgrades',
 'Check to delete': '打勾代表刪除',
 'Check to delete:': '打勾代表刪除:',
 'Checking for upgrades...': '檢查新版本中...',
 'Clean': '清除',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
+'click here for online examples': '點此處進入線上範例',
+'click here for the administrative interface': '點此處進入管理介面',
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
+'click to check for upgrades': '點擊打勾以便升級',
 'Client IP': '客戶端網址(IP)',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'collapse/expand all',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': '編譯',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': '已移除已編譯的應用程式',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controller': '控件',
 'Controllers': '控件',
+'controllers': '控件',
 'Copyright': '版權所有',
+'Count': 'Count',
 'Create': '創建',
+'create file with filename:': '創建檔案:',
+'create new application:': '創建新應用程式:',
 'Create new simple application': '創建應用程式',
+'Create/Upload': 'Create/Upload',
+'created by': '創建自',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': '定時執行表',
 'Current request': '目前網路資料要求(request)',
 'Current response': '目前網路資料回應(response)',
 'Current session': '目前網路連線資訊(session)',
-'DB Model': '資料庫模組',
-'DESIGN': '設計',
-'Database': '資料庫',
-'Date and Time': '日期和時間',
-'Delete': '刪除',
-'Delete:': '刪除:',
-'Deploy on Google App Engine': '配置到 Google App Engine',
-'Description': '描述',
-'Design for': '設計為了',
-'E-mail': '電子郵件',
-'EDIT': '編輯',
-'Edit': '編輯',
-'Edit Profile': '編輯設定檔',
-'Edit This App': '編輯本應用程式',
-'Edit application': '編輯應用程式',
-'Edit current record': '編輯當前紀錄',
-'Editing Language file': '編輯語言檔案',
-'Editing file': '編輯檔案',
-'Editing file "%s"': '編輯檔案"%s"',
-'Enterprise Web Framework': '企業網站平台',
-'Error logs for "%(app)s"': '"%(app)s"的錯誤紀錄',
-'Errors': '錯誤紀錄',
-'Exception instance attributes': 'Exception instance attributes',
-'First name': '名',
-'Functions with no doctests will result in [passed] tests.': '沒有 doctests 的函式會顯示 [passed].',
-'Group ID': '群組編號',
-'Hello World': '嗨! 世界',
-'Help': '說明檔',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
-'Import/Export': '匯入/匯出',
-'Index': '索引',
-'Install': '安裝',
-'Installed applications': '已安裝應用程式',
-'Internal State': '內部狀態',
-'Invalid Query': '不合法的查詢',
-'Invalid action': '不合法的動作(action)',
-'Invalid email': '不合法的電子郵件',
-'Language files (static strings) updated': '語言檔已更新',
-'Languages': '各國語言',
-'Last name': '姓',
-'Last saved on:': '最後儲存時間:',
-'Layout': '網頁配置',
-'License for': '許可證',
-'Login': '登入',
-'Login to the Administrative Interface': '登入到管理員介面',
-'Logout': '登出',
-'Lost Password': '密碼遺忘',
-'Main Menu': '主選單',
-'Menu Model': '選單模組(menu)',
-'Models': '資料模組',
-'Modules': '程式模組',
-'NO': '否',
-'Name': '名字',
-'New Record': '新紀錄',
-'No databases in this application': '這應用程式不含資料庫',
-'Origin': '原文',
-'Original/Translation': '原文/翻譯',
-'Overwrite installed app': '覆蓋已安裝的應用程式',
-'PAM authenticated user, cannot change password here': 'PAM 授權使用者, 無法在此變更密碼',
-'Pack all': '全部打包',
-'Pack compiled': '打包已編譯資料',
-'Password': '密碼',
-"Password fields don't match": '密碼欄不匹配',
-'Peeking at file': '選個文件',
-'Plugin "%s" in application': '在應用程式的插件 "%s"',
-'Plugins': '插件',
-'Powered by': '基於以下技術構建：',
-'Query:': '查詢:',
-'Record ID': '紀錄編號',
-'Register': '註冊',
-'Registration key': '註冊金鑰',
-'Remember me (for 30 days)': '記住帳號(30 天)',
-'Remove compiled': '編譯檔案已移除',
-'Reset Password key': '重設密碼',
-'Resolve Conflict file': '解決衝突檔案',
-'Role': '角色',
-'Rows in table': '在資料表裏的資料',
-'Rows selected': '筆資料被選擇',
-'Saved file hash:': '檔案雜湊值已紀錄:',
-'Site': '網站',
-'Static files': '靜態檔案',
-'Stylesheet': '網頁風格檔',
-'Submit': '傳送',
-'Sure you want to delete this object?': '確定要刪除此物件?',
-'TM': 'TM',
-'Table name': '資料表名稱',
-'Testing application': '測試中的應用程式',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"查詢"是一個像 "db.表1.欄位1==\'值\'" 的條件式. 以"db.表1.欄位1==db.表2.欄位2"方式則相當於執行 JOIN SQL.',
-'There are no controllers': '沒有控件(controllers)',
-'There are no models': '沒有資料庫模組(models)',
-'There are no modules': '沒有程式模組(modules)',
-'There are no static files': '沒有靜態檔案',
-'There are no translators, only default language is supported': '沒有翻譯檔,只支援原始語言',
-'There are no views': '沒有視圖',
-'This is the %(filename)s template': '這是%(filename)s檔案的樣板(template)',
-'Ticket': '問題單',
-'Timestamp': '時間標記',
-'To create a plugin, name a file/folder plugin_[name]': '檔案或目錄名稱以 plugin_開頭來創建插件',
-'Unable to check for upgrades': '無法做升級檢查',
-'Unable to download': '無法下載',
-'Unable to download app': '無法下載應用程式',
-'Unable to download app because:': '無法下載應用程式因為:',
-'Unable to download because': '因為下列原因無法下載:',
-'Uninstall': '解除安裝',
-'Update:': '更新:',
-'Upload & install packed application': '上傳並安裝已打包的應用程式',
-'Upload existing application': '更新存在的應用程式',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': '使用下列方式來組合更複雜的條件式, (...)&(...) 代表同時存在的條件, (...)|(...) 代表擇一的條件, ~(...)則代表反向條件.',
-'User %(id)s Logged-in': '使用者 %(id)s 已登入',
-'User %(id)s Registered': '使用者 %(id)s 已註冊',
-'User ID': '使用者編號',
-'Verify Password': '驗證密碼',
-'Version': '版本',
-'View': '視圖',
-'Views': '視圖',
-'Welcome %s': '歡迎 %s',
-'Welcome to web2py': '歡迎使用 web2py',
-'YES': '是',
-'additional code for your application': '應用程式額外的程式碼',
-'admin disabled because no admin password': '管理介面關閉原因是沒有設定管理員密碼 ',
-'admin disabled because not supported on google app engine': '管理介面關閉原因是不支援在google apps engine環境下運作',
-'admin disabled because unable to access password file': '管理介面關閉原因是無法存取密碼檔',
-'amy_ajax': 'amy_ajax',
-'and rename it (required):': '同時更名為(必要的):',
-'and rename it:': '同時更名為:',
-'appadmin': '應用程式管理員',
-'appadmin is disabled because insecure channel': '管理介面關閉理由是連線方式不安全',
-'application "%s" uninstalled': '已移除應用程式 "%s"',
-'application compiled': '已編譯應用程式',
-'application is compiled and cannot be designed': '應用程式已經編譯無法重新設計',
-'arguments': 'arguments',
-'back': '回復(back)',
-'cache': '快取記憶體',
-'cache, errors and sessions cleaned': '快取記憶體,錯誤紀錄,連線紀錄已清除',
-'cannot create file': '無法創建檔案',
-'cannot upload file "%(filename)s"': '無法上傳檔案 "%(filename)s"',
-'change_password': '變更密碼',
-'check all': '全選',
-'click here for online examples': '點此處進入線上範例',
-'click here for the administrative interface': '點此處進入管理介面',
-'click to check for upgrades': '點擊打勾以便升級',
-'code': 'code',
-'compiled application removed': '已移除已編譯的應用程式',
-'controllers': '控件',
-'create file with filename:': '創建檔案:',
-'create new application:': '創建新應用程式:',
-'created by': '創建自',
-'crontab': '定時執行表',
+'currently running': 'currently running',
 'currently saved or': '現在存檔或',
 'customize me!': '請調整我!',
 'data uploaded': '資料已上傳',
+'Database': '資料庫',
 'database': '資料庫',
+'Database %s select': 'Database %s select',
 'database %s select': '已選擇 %s 資料庫',
+'Database administration': 'Database administration',
 'database administration': '資料庫管理',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Date and Time': '日期和時間',
 'db': 'db',
+'DB Model': '資料庫模組',
+'Debug': 'Debug',
 'defines tables': '定義資料表',
+'Delete': '刪除',
 'delete': '刪除',
 'delete all checked': '刪除所有已選擇項目',
 'delete plugin': '刪除插件',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': '刪除:',
 'delete_plugin': '刪除插件',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
+'Deploy': 'Deploy',
+'Deploy on Google App Engine': '配置到 Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description': '描述',
+'Description:': 'Description:',
 'design': '設計',
+'DESIGN': '設計',
+'Design for': '設計為了',
+'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
 'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
+'Disable': 'Disable',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
 'done!': '完成!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
+'download layouts': 'download layouts',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'download plugins',
+'Download plugins from repository': 'Download plugins from repository',
+'E-mail': '電子郵件',
+'EDIT': '編輯',
+'Edit': '編輯',
+'edit all': 'edit all',
+'Edit application': '編輯應用程式',
 'edit controller': '編輯控件',
+'edit controller:': 'edit controller:',
+'Edit current record': '編輯當前紀錄',
+'Edit Profile': '編輯設定檔',
+'Edit This App': '編輯本應用程式',
 'edit views:': '編輯視圖',
 'edit_language': '編輯語言檔',
+'Editing %s': 'Editing %s',
+'Editing file': '編輯檔案',
+'Editing file "%s"': '編輯檔案"%s"',
+'Editing Language file': '編輯語言檔案',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
+'Enterprise Web Framework': '企業網站平台',
+'Error': 'Error',
+'Error logs for "%(app)s"': '"%(app)s"的錯誤紀錄',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': '錯誤紀錄',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Exception instance attributes',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': '以逗號分隔檔(csv)格式匯出',
+'Exports:': 'Exports:',
 'exposes': '外顯',
+'exposes:': 'exposes:',
 'extends': '擴展',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module because:': '因為下列原因無法重新載入程式模組:',
+'File': 'File',
 'file "%(filename)s" created': '檔案 "%(filename)s" 已創建',
 'file "%(filename)s" deleted': '檔案 "%(filename)s" 已刪除',
 'file "%(filename)s" uploaded': '檔案 "%(filename)s" 已上傳',
 'file "%s" of %s restored': '檔案 %s 的 "%s" 已回存',
 'file changed on disk': '在磁碟上檔案已改變',
 'file does not exist': '檔案不存在',
+'file not found': 'file not found',
 'file saved on %(time)s': '檔案已於 %(time)s 儲存',
 'file saved on %s': '檔案在 %s 已儲存',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
+'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'First name': '名',
+'Form has errors': 'Form has errors',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': '沒有 doctests 的函式會顯示 [passed].',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Group ID': '群組編號',
+'Hello World': '嗨! 世界',
+'Help': '說明檔',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'html編輯',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': '匯入/匯出',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': '包含',
+'Indent with tabs': 'Indent with tabs',
+'Index': '索引',
 'index': '索引',
 'insert new': '插入新資料',
 'insert new %s': '插入新資料 %s',
+'inspect attributes': 'inspect attributes',
+'Install': '安裝',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': '已安裝應用程式',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': '內部錯誤',
+'internal error: %s': 'internal error: %s',
+'Internal State': '內部狀態',
+'Invalid action': '不合法的動作(action)',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid email': '不合法的電子郵件',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': '密碼錯誤',
+'invalid password.': 'invalid password.',
+'Invalid Query': '不合法的查詢',
 'invalid request': '不合法的網路要求(request)',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': '不合法的問題單號',
+'Key': 'Key',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': '語言檔"%(filename)s"已創建或更新',
+'Language files (static strings) updated': '語言檔已更新',
 'languages': '語言檔',
+'Languages': '各國語言',
+'Last name': '姓',
+'Last Revision': 'Last Revision',
+'Last saved on:': '最後儲存時間:',
+'Layout': '網頁配置',
+'License for': '許可證',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': '載入中...',
+'Local Apps': 'Local Apps',
+'locals': 'locals',
+'Locals##debug': 'Locals##debug',
 'login': '登入',
+'Login': '登入',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': '登入到管理員介面',
+'Login/Register': 'Login/Register',
+'Logout': '登出',
+'Lost Password': '密碼遺忘',
+'lost password': 'lost password',
+'Main Menu': '主選單',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
+'Menu Model': '選單模組(menu)',
 'merge': '合併',
+'Models': '資料模組',
 'models': '資料庫模組',
+'Modified On': 'Modified On',
+'Modules': '程式模組',
 'modules': '程式模組',
+'Multi User Mode': 'Multi User Mode',
+'Name': '名字',
 'new application "%s" created': '已創建新的應用程式 "%s"',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
+'New application wizard': 'New application wizard',
 'new plugin installed': '已安裝新插件',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': '新紀錄',
 'new record inserted': '已新增新紀錄',
+'New simple application': 'New simple application',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': '往後 100 筆',
+'NO': '否',
+'no changes': 'no changes',
+'No databases in this application': '這應用程式不含資料庫',
+'No Interaction yet': 'No Interaction yet',
 'no match': '無法匹配',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': '或是從逗號分隔檔(CSV)匯入',
 'or provide app url:': '或是提供應用程式的安裝網址:',
+'Origin': '原文',
+'Original/Translation': '原文/翻譯',
+'Overview': 'Overview',
+'Overwrite installed app': '覆蓋已安裝的應用程式',
+'Pack all': '全部打包',
+'Pack compiled': '打包已編譯資料',
+'Pack custom': 'Pack custom',
 'pack plugin': '打包插件',
+'PAM authenticated user, cannot change password here': 'PAM 授權使用者, 無法在此變更密碼',
+'Password': '密碼',
 'password changed': '密碼已變更',
+"Password fields don't match": '密碼欄不匹配',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
 'peek': '選取',
+'Peeking at file': '選個文件',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin': '插件',
 'plugin "%(plugin)s" deleted': '已刪除插件"%(plugin)s"',
+'Plugin "%s" in application': '在應用程式的插件 "%s"',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
+'plugins': 'plugins',
+'Plugins': '插件',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': '基於以下技術構建：',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': '往前 100 筆',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': '查詢:',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
 'record': '紀錄',
 'record does not exist': '紀錄不存在',
 'record id': '紀錄編號',
+'Record ID': '紀錄編號',
+'Record id': 'Record id',
+'refresh': 'refresh',
 'register': '註冊',
+'Register': '註冊',
+'Registration key': '註冊金鑰',
+'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': '記住帳號(30 天)',
+'Remove compiled': '編譯檔案已移除',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
+'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': '重設密碼',
 'resolve': '解決',
+'Resolve Conflict file': '解決衝突檔案',
+'response': 'response',
+'restart': 'restart',
 'restore': '回存',
+'return': 'return',
+'Revert': 'Revert',
 'revert': '反向恢復',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': '角色',
+'Roles': 'Roles',
+'Rows in table': '在資料表裏的資料',
+'Rows in Table': 'Rows in Table',
+'Rows selected': '筆資料被選擇',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Running on %s',
+'Save': 'Save',
 'save': '儲存',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': '檔案雜湊值已紀錄:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': '已選擇',
+'session': 'session',
 'session expired': '連線(session)已過時',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': '命令列操作介面',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': '網站',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': '部份檔案無法移除',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Start searching',
+'Start wizard': 'Start wizard',
 'state': '狀態',
+'Static': 'Static',
 'static': '靜態檔案',
+'Static files': '靜態檔案',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
+'Stylesheet': '網頁風格檔',
 'submit': '傳送',
+'Submit': '傳送',
+'successful': 'successful',
+'Sure you want to delete this object?': '確定要刪除此物件?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': '資料表',
+'Table': 'Table',
+'Table name': '資料表名稱',
+'Temporary': 'Temporary',
 'test': '測試',
+'Testing application': '測試中的應用程式',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"查詢"是一個像 "db.表1.欄位1==\'值\'" 的條件式. 以"db.表1.欄位1==db.表2.欄位2"方式則相當於執行 JOIN SQL.',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': '應用程式邏輯 - 每個網址路徑對應到一個控件的函式',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'the data representation, define database tables and sets': '資料展現層 - 用來定義資料表和集合',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
 'the presentations layer, views are also known as templates': '外觀展現層 - 視圖有時也被稱為樣板',
+'Theme': 'Theme',
+'There are no controllers': '沒有控件(controllers)',
+'There are no models': '沒有資料庫模組(models)',
+'There are no modules': '沒有程式模組(modules)',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': '沒有靜態檔案',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': '沒有翻譯檔,只支援原始語言',
+'There are no views': '沒有視圖',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': '這些檔案保留未經處理,你的影像檔在此',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': '這是%(filename)s檔案的樣板(template)',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
 'ticket': '問題單',
+'Ticket': '問題單',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': '時間標記',
+'TM': 'TM',
 'to  previous version.': '到前一個版本',
+'To create a plugin, name a file/folder plugin_[name]': '檔案或目錄名稱以 plugin_開頭來創建插件',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
 'translation strings for the application': '翻譯此應用程式的字串',
+'Translation strings for the application': 'Translation strings for the application',
 'try': '嘗試',
 'try something like': '嘗試如',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': '無法做升級檢查',
 'unable to create application "%s"': '無法創建應用程式 "%s"',
 'unable to delete file "%(filename)s"': '無法刪除檔案 "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': '無法刪查插件檔 "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download': '無法下載',
+'Unable to download app': '無法下載應用程式',
+'Unable to download app because:': '無法下載應用程式因為:',
+'Unable to download because': '因為下列原因無法下載:',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': '無法解析逗號分隔檔(csv)',
 'unable to uninstall "%s"': '無法移除安裝 "%s"',
 'unable to upgrade because "%s"': '無法升級因為 "%s"',
 'uncheck all': '全不選',
+'Uninstall': '解除安裝',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': '更新',
 'update all languages': '將程式中待翻譯語句更新到所有的語言檔',
+'Update:': '更新:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'upgrade web2py now',
 'upgrade_web2py': '升級 web2py',
+'upload': 'upload',
+'Upload': 'Upload',
+'Upload & install packed application': '上傳並安裝已打包的應用程式',
+'Upload a package:': 'Upload a package:',
+'Upload and install packed application': 'Upload and install packed application',
 'upload application:': '上傳應用程式:',
+'Upload existing application': '更新存在的應用程式',
 'upload file:': '上傳檔案:',
 'upload plugin file:': '上傳插件檔:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': '使用下列方式來組合更複雜的條件式, (...)&(...) 代表同時存在的條件, (...)|(...) 代表擇一的條件, ~(...)則代表反向條件.',
+'User': 'User',
+'User %(id)s Logged-in': '使用者 %(id)s 已登入',
+'User %(id)s Registered': '使用者 %(id)s 已註冊',
+'User ID': '使用者編號',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Verify Password': '驗證密碼',
+'Version': '版本',
+'Versioning': 'Versioning',
 'versioning': '版本管理',
+'View': '視圖',
 'view': '視圖',
+'Views': '視圖',
 'views': '視圖',
-'web2py Recent Tweets': 'web2py 最近的 Tweets',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py 已經是最新版',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'web2py 最近的 Tweets',
+'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': '已升級 web2py ; 請重新啟動',
+'Welcome %s': '歡迎 %s',
+'Welcome to web2py': '歡迎使用 web2py',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': '是',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/languages/zh.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'zh-cn',
 '!langname!': '中文',
@@ -6,215 +6,243 @@
 '"save"': '"保存"',
 '"submit"': '"提交"',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"更新"是可配置项 如 "field1=\'newvalue\'",你无法在JOIN 中更新或删除',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'"User Exception" debug mode. ': '"User Exception" debug mode. ',
+'%s': '%s',
 '%s %%{row} deleted': '%s 行已删',
 '%s %%{row} updated': '%s 行更新',
+'%s selected': '%s selected',
+'%s students registered': '%s students registered',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '(requires internet access)': '(requires internet access)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(就酱 "it-it")',
+'(version %s)': '(version %s)',
+'?': '?',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
 'A new version of web2py is available': '新版本web2py已经可用',
 'A new version of web2py is available: %s': '新版本web2py已经可用: %s',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': '',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': '',
-'ATTENTION: you cannot edit the running application!': '注意: 不能修改正在运行中的应用!',
+'Abort': 'Abort',
 'About': '关于',
 'About application': '关于这个应用',
+'Accept Terms': 'Accept Terms',
+'Add breakpoint': 'Add breakpoint',
+'additional code for your application': '给你的应用附加代码',
+'Additional code for your application': 'Additional code for your application',
+'Admin design page': 'Admin design page',
+'admin disabled because no admin password': '管理员需要设定密码，否则无法管理',
+'admin disabled because not supported on google app engine': '未支持GAE,无法管理',
+'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
+'admin disabled because unable to access password file': '需要可以操作密码文件，否则无法进行管理',
 'Admin is disabled because insecure channel': '管理因不安全通道而关闭',
 'Admin is disabled because unsecure channel': '管理因不稳定通道而关闭',
 'Admin language': 'Admin language',
+'Admin versioning page': 'Admin versioning page',
+'administrative interface': 'administrative interface',
 'Administrator Password:': '管理员密码:',
+'and rename it (required):': '重命名为 (必须):',
+'and rename it:': ' 重命名为:',
+'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
+'appadmin': '应用管理',
+'appadmin is disabled because insecure channel': '应用管理因非法通道失效',
+'Application': 'Application',
+'application "%s" uninstalled': '应用"%s" 已被卸载',
+'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
+'application compiled': '应用已编译完',
+'Application exists already': 'Application exists already',
+'application is compiled and cannot be designed': '应用已编译完无法设计',
 'Application name:': 'Application name:',
+'Application updated via git pull': 'Application updated via git pull',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': '你真想删除文件"%s"?',
 'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'Are you sure you want to uninstall application "%s"': '你真确定要卸载应用 "%s"',
 'Are you sure you want to uninstall application "%s"?': '你真确定要卸载应用 "%s" ?',
 'Are you sure you want to upgrade web2py now?': 'Are you sure you want to upgrade web2py now?',
+'Are you sure?': 'Are you sure?',
+'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': '',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': '',
+'ATTENTION: you cannot edit the running application!': '注意: 不能修改正在运行中的应用!',
+'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': '可用数据库/表',
+'Available Databases and Tables': 'Available Databases and Tables',
+'back': 'back',
+'Back to the plugins list': 'Back to the plugins list',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Begin',
+'breakpoint': 'breakpoint',
+'Breakpoints': 'Breakpoints',
+'breakpoints': 'breakpoints',
+'Bulk Register': 'Bulk Register',
+'Bulk Student Registration': 'Bulk Student Registration',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Cleared': 'Cache Cleared',
+'Cache Keys': 'Cache Keys',
+'cache, errors and sessions cleaned': '缓存、错误、sesiones已被清空',
+'can be a git repo': 'can be a git repo',
+'Cancel': 'Cancel',
 'Cannot be empty': '不能不填',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': '无法编译: 应用中有错误,请修订后再试.',
 'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
-'Change Password': '修改密码',
+'cannot create file': '无法创建文件',
+'cannot upload file "%(filename)s"': '无法上传文件 "%(filename)s"',
+'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
+'change editor settings': 'change editor settings',
+'Change Password': '修改密码',
+'Changelog': 'Changelog',
+'check all': '检查所有',
 'Check for upgrades': 'check for upgrades',
 'Check to delete': '检验删除',
 'Checking for upgrades...': '是否有升级版本检查ing...',
 'Clean': '清除',
+'Clear': 'Clear',
+'Clear CACHE?': 'Clear CACHE?',
+'Clear DISK': 'Clear DISK',
+'Clear RAM': 'Clear RAM',
+'click here for online examples': '猛击此处，查看在线实例',
+'click here for the administrative interface': '猛击此处，进入管理界面',
+'Click row to expand traceback': 'Click row to expand traceback',
+'Click row to view a ticket': 'Click row to view a ticket',
+'click to check for upgrades': '猛击查看是否有升级版本',
 'Client IP': '客户端IP',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'collapse/expand all',
+'Command': 'Command',
+'Comment:': 'Comment:',
+'Commit': 'Commit',
+'Commit form': 'Commit form',
+'Committed files': 'Committed files',
 'Compile': '编译',
+'Compile (all or nothing)': 'Compile (all or nothing)',
+'Compile (skip failed views)': 'Compile (skip failed views)',
+'compiled application removed': '已编译应用已移走',
+'Condition': 'Condition',
+'continue': 'continue',
 'Controllers': '控制器s',
+'controllers': '控制器',
+'Count': 'Count',
 'Create': 'create',
+'create file with filename:': '创建文件用这名:',
+'create new application:': '创建新应用:',
 'Create new simple application': '创建一个新应用',
+'Create/Upload': 'Create/Upload',
+'created by': '创建自',
+'Created by:': 'Created by:',
+'Created On': 'Created On',
+'Created on:': 'Created on:',
+'crontab': '定期事务',
 'Current request': '当前请求',
 'Current response': '当前返回',
 'Current session': '当前会话',
-'DESIGN': '设计',
-'Date and Time': '时间日期',
-'Debug': 'Debug',
-'Delete': '删除',
-'Delete:': '删除:',
-'Deploy': 'deploy',
-'Deploy on Google App Engine': '部署到GAE',
-'Deploy to OpenShift': 'Deploy to OpenShift',
-'Description': '描述',
-'Design for': '设计:',
-'Disable': 'Disable',
-'E-mail': '邮箱:',
-'EDIT': '编辑',
-'Edit': '修改',
-'Edit Profile': '修订配置',
-'Edit application': '修订应用',
-'Edit current record': '修订当前记录',
-'Editing Language file': '修订语言文件',
-'Editing file': '修订文件',
-'Editing file "%s"': '修订文件 %s',
-'Enterprise Web Framework': '强悍的网络开发框架',
-'Error logs for "%(app)s"': '"%(app)s" 的错误日志',
-'Errors': '错误',
-'Exception instance attributes': 'Exception instance attributes',
-'First name': '姓',
-'Functions with no doctests will result in [passed] tests.': '',
-'Get from URL:': 'Get from URL:',
-'Group ID': '组ID',
-'Hello World': '道可道，非常道；名可名，非常名',
-'Help': '帮助',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
-'Import/Export': '导入/导出',
-'Install': 'install',
-'Installed applications': '已安装的应用',
-'Internal State': '内部状态',
-'Invalid Query': '无效查询',
-'Invalid action': '无效动作',
-'Invalid email': '无效的email',
-'Language files (static strings) updated': '语言文件(静态部分)已更新',
-'Languages': '语言',
-'Last name': '名',
-'Last saved on:': '最后保存于:',
-'License for': '许可证',
-'Login': '登录',
-'Login to the Administrative Interface': '登录到管理员界面',
-'Logout': '注销',
-'Lost Password': '忘记密码',
-'Models': '模型s',
-'Modules': '模块s',
-'NO': '不',
-'Name': '姓名',
-'New Record': '新记录',
-'New application wizard': 'New application wizard',
-'New simple application': 'New simple application',
-'No databases in this application': '这应用没有数据库',
-'Origin': '起源',
-'Original/Translation': '原始文件/翻译文件',
-'Overwrite installed app': 'overwrite installed app',
-'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
-'Pack all': '全部打包',
-'Pack compiled': '包编译完',
-'Password': '密码',
-'Peeking at file': '选个文件',
-'Plugin "%s" in application': 'Plugin "%s" in application',
-'Plugins': 'Plugins',
-'Powered by': '',
-'Query:': '查询',
-'Record ID': '记录ID',
-'Register': '注册',
-'Registration key': '注册密匙',
-'Reload routes': 'Reload routes',
-'Remove compiled': '已移除',
-'Resolve Conflict file': '解决冲突文件',
-'Role': '角色',
-'Rows in table': '表行',
-'Rows selected': '行选择',
-'Running on %s': 'Running on %s',
-'Saved file hash:': '已存文件Hash:',
-'Site': '总站',
-'Start wizard': 'start wizard',
-'Static files': '静态文件',
-'Sure you want to delete this object?': '真的要删除这个对象?',
-'TM': '',
-'Table name': '表名',
-'Testing application': '应用测试',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '',
-'There are no controllers': '冇控制器',
-'There are no models': '冇模型s',
-'There are no modules': '冇模块s',
-'There are no static files': '冇静态文件',
-'There are no translators, only default language is supported': '没有找到相应翻译，只能使用默认语言',
-'There are no views': '冇视图',
-'This is the %(filename)s template': '这是 %(filename)s 模板',
-'Ticket': '传票',
-'Timestamp': '时间戳',
-'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
-'Unable to check for upgrades': '无法检查是否需要升级',
-'Unable to download': '无法下载',
-'Unable to download app': '无法下载应用',
-'Unable to download app because:': 'Unable to download app because:',
-'Unable to download because': 'Unable to download because',
-'Uninstall': '卸载',
-'Update:': '更新:',
-'Upload & install packed application': 'Upload & install packed application',
-'Upload a package:': 'Upload a package:',
-'Upload and install packed application': 'Upload and install packed application',
-'Upload existing application': '上传已有应用',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': '',
-'Use an url:': 'Use an url:',
-'User ID': '用户ID',
-'Version': '版本',
-'Views': '视图',
-'Welcome to web2py': '欢迎使用web2py',
-'YES': '是',
-'additional code for your application': '给你的应用附加代码',
-'admin disabled because no admin password': '管理员需要设定密码，否则无法管理',
-'admin disabled because not supported on google app engine': '未支持GAE,无法管理',
-'admin disabled because unable to access password file': '需要可以操作密码文件，否则无法进行管理',
-'administrative interface': 'administrative interface',
-'and rename it (required):': '重命名为 (必须):',
-'and rename it:': ' 重命名为:',
-'appadmin': '应用管理',
-'appadmin is disabled because insecure channel': '应用管理因非法通道失效',
-'application "%s" uninstalled': '应用"%s" 已被卸载',
-'application compiled': '应用已编译完',
-'application is compiled and cannot be designed': '应用已编译完无法设计',
-'arguments': 'arguments',
-'back': 'back',
-'cache': 'cache',
-'cache, errors and sessions cleaned': '缓存、错误、sesiones已被清空',
-'cannot create file': '无法创建文件',
-'cannot upload file "%(filename)s"': '无法上传文件 "%(filename)s"',
-'check all': '检查所有',
-'click here for online examples': '猛击此处，查看在线实例',
-'click here for the administrative interface': '猛击此处，进入管理界面',
-'click to check for upgrades': '猛击查看是否有升级版本',
-'code': 'code',
-'compiled application removed': '已编译应用已移走',
-'controllers': '控制器',
-'create file with filename:': '创建文件用这名:',
-'create new application:': '创建新应用:',
-'created by': '创建自',
-'crontab': '定期事务',
 'currently running': 'currently running',
 'currently saved or': '保存当前的或',
 'customize me!': '定制俺!',
 'data uploaded': '数据已上传',
+'Database': 'Database',
 'database': '数据库',
+'Database %s select': 'Database %s select',
 'database %s select': '数据库 %s 选择',
+'Database administration': 'Database administration',
 'database administration': '数据库管理',
+'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Date and Time': '时间日期',
 'db': '',
+'Debug': 'Debug',
 'defines tables': '已定义表',
+'Delete': '删除',
 'delete': '删除',
 'delete all checked': '删除所有选择的',
 'delete plugin': 'delete plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': '删除:',
+'deleted after first hit': 'deleted after first hit',
+'Demo': 'Demo',
+'Deploy': 'deploy',
+'Deploy on Google App Engine': '部署到GAE',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to pythonanywhere': 'Deploy to pythonanywhere',
+'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
+'Deployment form': 'Deployment form',
+'Deployment Interface': 'Deployment Interface',
+'Description': '描述',
+'Description:': 'Description:',
 'design': '设计',
+'DESIGN': '设计',
+'Design for': '设计:',
+'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
 'direction: ltr': 'direction: ltr',
+'directory not found': 'directory not found',
+'Disable': 'Disable',
+'Disabled': 'Disabled',
+'disabled in demo mode': 'disabled in demo mode',
+'disabled in GAE mode': 'disabled in GAE mode',
+'disabled in multi user mode': 'disabled in multi user mode',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk Cleared',
+'Display line numbers': 'Display line numbers',
+'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
+'docs': 'docs',
+'Docs': 'Docs',
 'done!': '搞定!',
+'Downgrade': 'Downgrade',
+'Download .w2p': 'Download .w2p',
+'Download as .exe': 'Download as .exe',
+'download layouts': 'download layouts',
+'Download layouts from repository': 'Download layouts from repository',
+'download plugins': 'download plugins',
+'Download plugins from repository': 'Download plugins from repository',
+'E-mail': '邮箱:',
+'EDIT': '编辑',
+'Edit': '修改',
+'edit all': 'edit all',
+'Edit application': '修订应用',
 'edit controller': '修订控制器',
+'edit controller:': 'edit controller:',
+'Edit current record': '修订当前记录',
+'Edit Profile': '修订配置',
 'edit views:': 'edit views:',
+'Editing %s': 'Editing %s',
+'Editing file': '修订文件',
+'Editing file "%s"': '修订文件 %s',
+'Editing Language file': '修订语言文件',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Editor': 'Editor',
+'Email Address': 'Email Address',
+'Enable': 'Enable',
+'Enable Close-Tag': 'Enable Close-Tag',
+'Enable Code Folding': 'Enable Code Folding',
+'Enterprise Web Framework': '强悍的网络开发框架',
+'Error': 'Error',
+'Error logs for "%(app)s"': '"%(app)s" 的错误日志',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': '错误',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Exception instance attributes',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': '导出为CSV文件',
+'Exports:': 'Exports:',
 'exposes': '暴露',
+'exposes:': 'exposes:',
 'extends': '扩展',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module': '重新加载模块失败',
 'failed to reload module because:': 'failed to reload module because:',
+'File': 'File',
 'file "%(filename)s" created': '文件 "%(filename)s" 已创建',
 'file "%(filename)s" deleted': '文件 "%(filename)s" 已删除',
 'file "%(filename)s" uploaded': '文件 "%(filename)s" 已上传',
@@ -222,78 +250,417 @@
 'file "%s" of %s restored': '文件"%s" 有关 %s 已重存',
 'file changed on disk': '硬盘上的文件已经修改',
 'file does not exist': '文件并不存在',
+'file not found': 'file not found',
 'file saved on %(time)s': '文件保存于 %(time)s',
 'file saved on %s': '文件保存在 %s',
+'filename': 'filename',
+'Filename': 'Filename',
+'Files added': 'Files added',
+'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'First name': '姓',
+'Form has errors': 'Form has errors',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': '',
+'GAE Email': 'GAE Email',
+'GAE Output': 'GAE Output',
+'GAE Password': 'GAE Password',
+'Generate': 'Generate',
+'Get from URL:': 'Get from URL:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globals##debug',
+'go!': 'go!',
+'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
+'Google Application Id': 'Google Application Id',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Group ID': '组ID',
+'Hello World': '道可道，非常道；名可名，非常名',
+'Help': '帮助',
+'here': 'here',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
+'Highlight current line': 'Highlight current line',
+'Hits': 'Hits',
+'Home': 'Home',
+'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
 'htmledit': 'html编辑',
+'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
+'import': 'import',
+'Import/Export': '导入/导出',
+'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': '包含',
+'Indent with tabs': 'Indent with tabs',
 'insert new': '新插入',
 'insert new %s': '新插入 %s',
+'inspect attributes': 'inspect attributes',
+'Install': 'install',
+'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
+'Installed applications': '已安装的应用',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': '内部错误',
+'internal error: %s': 'internal error: %s',
+'Internal State': '内部状态',
+'Invalid action': '无效动作',
+'Invalid application name': 'Invalid application name',
+'invalid circular reference': 'invalid circular reference',
+'Invalid email': '无效的email',
+'Invalid git repository specified.': 'Invalid git repository specified.',
 'invalid password': '无效密码',
+'invalid password.': 'invalid password.',
+'Invalid Query': '无效查询',
 'invalid request': '无效请求',
+'Invalid request': 'Invalid request',
+'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': '无效传票',
+'Key': 'Key',
+'Keyboard shortcuts': 'Keyboard shortcuts',
+'kill process': 'kill process',
 'language file "%(filename)s" created/updated': '语言文件 "%(filename)s"被创建/更新',
+'Language files (static strings) updated': '语言文件(静态部分)已更新',
 'languages': '语言',
+'Languages': '语言',
 'languages updated': '语言已被刷新',
+'Last name': '名',
+'Last Revision': 'Last Revision',
+'Last saved on:': '最后保存于:',
+'License for': '许可证',
+'License:': 'License:',
+'Line Nr': 'Line Nr',
+'Line number': 'Line number',
+'lists by exception': 'lists by exception',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
 'loading...': '载入中...',
+'Local Apps': 'Local Apps',
+'locals': 'locals',
+'Locals##debug': 'Locals##debug',
 'login': '登录',
+'Login': '登录',
+'Login successful': 'Login successful',
+'Login to the Administrative Interface': '登录到管理员界面',
+'Login/Register': 'Login/Register',
+'Logout': '注销',
+'Lost Password': '忘记密码',
+'lost password': 'lost password',
+'Main Menu': 'Main Menu',
+'Manage': 'Manage',
+'Manage %(action)s': 'Manage %(action)s',
+'Manage Access Control': 'Manage Access Control',
+'Manage Admin Users/Students': 'Manage Admin Users/Students',
+'Manage Cache': 'Manage Cache',
+'Manage Students': 'Manage Students',
+'Memberships': 'Memberships',
 'merge': '合并',
+'Models': '模型s',
 'models': '模型s',
+'Modified On': 'Modified On',
+'Modules': '模块s',
 'modules': '模块s',
+'Multi User Mode': 'Multi User Mode',
+'Name': '姓名',
 'new application "%s" created': '新应用 "%s"已被创建',
+'new application "%s" imported': 'new application "%s" imported',
+'New Application Wizard': 'New Application Wizard',
+'New application wizard': 'New application wizard',
 'new plugin installed': 'new plugin installed',
+'New plugin installed: %s': 'New plugin installed: %s',
+'New Record': '新记录',
 'new record inserted': '新记录被插入',
+'New simple application': 'New simple application',
+'next': 'next',
+'next %s rows': 'next %s rows',
 'next 100 rows': '后100行',
+'NO': '不',
+'no changes': 'no changes',
+'No databases in this application': '这应用没有数据库',
+'No Interaction yet': 'No Interaction yet',
 'no match': 'no match',
+'no package selected': 'no package selected',
+'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
+'Node:': 'Node:',
+'Not Authorized': 'Not Authorized',
+'Not supported': 'Not supported',
+'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+"On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
+'Open new app in new window': 'Open new app in new window',
+'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
+'OpenShift Output': 'OpenShift Output',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': '或者，从csv文件导入',
 'or provide app url:': 'or provide app url:',
 'or provide application url:': '或者，提供应用所在地址链接:',
+'Origin': '起源',
+'Original/Translation': '原始文件/翻译文件',
+'Overview': 'Overview',
+'Overwrite installed app': 'overwrite installed app',
+'Pack all': '全部打包',
+'Pack compiled': '包编译完',
+'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
+'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
+'Password': '密码',
 'password changed': 'password changed',
+'Past revisions': 'Past revisions',
+'Path to appcfg.py': 'Path to appcfg.py',
+'Path to local openshift repo root.': 'Path to local openshift repo root.',
+'Peeking at file': '选个文件',
+'Permission': 'Permission',
+'Permissions': 'Permissions',
+'Please': 'Please',
+'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
+'Plugin "%s" in application': 'Plugin "%s" in application',
+'plugin not specified': 'plugin not specified',
+'Plugin page': 'Plugin page',
+'plugins': 'plugins',
+'Plugins': 'Plugins',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': '',
+'Preferences saved correctly': 'Preferences saved correctly',
+'Preferences saved on session only': 'Preferences saved on session only',
+'previous %s rows': 'previous %s rows',
 'previous 100 rows': '前100行',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Project Progress',
+'Pull': 'Pull',
+'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
+'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.': 'Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.',
+'Push': 'Push',
+'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
+'pygraphviz library not found': 'pygraphviz library not found',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': '查询',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram Cleared',
+'Rapid Search': 'Rapid Search',
+'Record': 'Record',
 'record': 'record',
 'record does not exist': '记录并不存在',
 'record id': '记录ID',
+'Record ID': '记录ID',
+'Record id': 'Record id',
+'refresh': 'refresh',
+'register': 'register',
+'Register': '注册',
+'Registration key': '注册密匙',
+'Reload routes': 'Reload routes',
+'Remove compiled': '已移除',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Repository (%s)': 'Repository (%s)',
+'request': 'request',
+'requires distutils, but not installed': 'requires distutils, but not installed',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': '解决冲突文件',
+'response': 'response',
+'restart': 'restart',
 'restore': '重存',
+'return': 'return',
+'Revert': 'Revert',
 'revert': '恢复',
+'reverted to revision %s': 'reverted to revision %s',
+'Revision %s': 'Revision %s',
+'Revision:': 'Revision:',
+'Role': '角色',
+'Roles': 'Roles',
+'Rows in table': '表行',
+'Rows in Table': 'Rows in Table',
+'Rows selected': '行选择',
+'rules are not defined': 'rules are not defined',
+'Run tests': 'Run tests',
+'Run tests in this file': 'Run tests in this file',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Running on %s',
+'Save': 'Save',
 'save': '保存',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save model as...': 'Save model as...',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': '已存文件Hash:',
+'Screenshot %s': 'Screenshot %s',
+'Search': 'Search',
+'Select Files to Package': 'Select Files to Package',
 'selected': '已选',
+'session': 'session',
 'session expired': '会话过期',
+'Session saved correctly': 'Session saved correctly',
+'Session saved on session only': 'Session saved on session only',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': '',
+'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Singular Form': 'Singular Form',
+'Site': '总站',
+'Size of cache:': 'Size of cache:',
+'skip to generate': 'skip to generate',
 'some files could not be removed': '有些文件无法被移除',
+'Something went wrong please wait a few minutes before retrying': 'Something went wrong please wait a few minutes before retrying',
+'Sorry, could not find mercurial installed': 'Sorry, could not find mercurial installed',
+'source : db': 'source : db',
+'source : filesystem': 'source : filesystem',
+'Start a new app': 'Start a new app',
+'Start searching': 'Start searching',
+'Start wizard': 'start wizard',
 'state': '状态',
+'Static': 'Static',
 'static': '静态文件',
+'Static files': '静态文件',
+'Statistics': 'Statistics',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
 'submit': '提交',
+'Submit': 'Submit',
+'successful': 'successful',
+'Sure you want to delete this object?': '真的要删除这个对象?',
+'switch to : db': 'switch to : db',
+'switch to : filesystem': 'switch to : filesystem',
+'Tab width (# characters)': 'Tab width (# characters)',
 'table': '表',
+'Table': 'Table',
+'Table name': '表名',
+'Temporary': 'Temporary',
 'test': '测试',
+'Testing application': '应用测试',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '',
+'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
+'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'the application logic, each URL path is mapped in one exposed function in the controller': '应用逻辑:每个URL由控制器暴露的函式完成映射',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'the data representation, define database tables and sets': '数据表达式,定义数据库/表',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
 'the presentations layer, views are also known as templates': '提交层/视图都在模板中可知',
+'Theme': 'Theme',
+'There are no controllers': '冇控制器',
+'There are no models': '冇模型s',
+'There are no modules': '冇模块s',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': '冇静态文件',
+'There are no translators': 'There are no translators',
+'There are no translators, only default language is supported': '没有找到相应翻译，只能使用默认语言',
+'There are no views': '冇视图',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': '',
+"This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': '这是 %(filename)s 模板',
+"This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
+'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
+'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
+'Ticket': '传票',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket Missing',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': '时间戳',
+'TM': '',
 'to  previous version.': 'to  previous version.',
+'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
 'to  previous version.': '退回前一版本',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
 'translation strings for the application': '应用的翻译字串',
+'Translation strings for the application': 'Translation strings for the application',
 'try': '尝试',
 'try something like': '尝试',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': '无法检查是否需要升级',
 'unable to create application "%s"': '无法创建应用 "%s"',
 'unable to delete file "%(filename)s"': '无法删除文件 "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
+'Unable to determine the line number!': 'Unable to determine the line number!',
+'Unable to download': '无法下载',
+'Unable to download app': '无法下载应用',
+'Unable to download app because:': 'Unable to download app because:',
+'Unable to download because': 'Unable to download because',
+'unable to download layout': 'unable to download layout',
+'unable to download plugin: %s': 'unable to download plugin: %s',
+'Unable to download the list of plugins': 'Unable to download the list of plugins',
+'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': '无法生成 cvs',
 'unable to uninstall "%s"': '无法卸载 "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': '反选全部',
+'Uninstall': '卸载',
+'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': '更新',
 'update all languages': '更新所有语言',
+'Update:': '更新:',
+'Upgrade': 'Upgrade',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'upgrade web2py now',
+'upload': 'upload',
+'Upload': 'Upload',
+'Upload & install packed application': 'Upload & install packed application',
+'Upload a package:': 'Upload a package:',
+'Upload and install packed application': 'Upload and install packed application',
 'upload application:': '提交已有的应用:',
+'Upload existing application': '上传已有应用',
 'upload file:': '提交文件:',
 'upload plugin file:': 'upload plugin file:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': '',
+'Use an url:': 'Use an url:',
+'User': 'User',
+'User ID': '用户ID',
+'Username': 'Username',
+'Users': 'Users',
+'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Version': '版本',
+'Versioning': 'Versioning',
 'versioning': '版本',
 'view': '视图',
+'Views': '视图',
 'views': '视图s',
-'web2py Recent Tweets': 'twitter上的web2py进展实播',
+'Warning!': 'Warning!',
+'WARNING:': 'WARNING:',
+'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py apps to deploy': 'web2py apps to deploy',
+'web2py Debugger': 'web2py Debugger',
+'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py现在已经是最新的版本了',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'twitter上的web2py进展实播',
+'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome to web2py': '欢迎使用web2py',
+'Working...': 'Working...',
+'WSGI reference name': 'WSGI reference name',
+'YES': '是',
+'Yes': 'Yes',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
+'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
+'You need to set up and reach a': 'You need to set up and reach a',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
 }

applications/admin/models/0.py

@@ -45,4 +45,6 @@ if 'adminLanguage' in request.cookies and not (request.cookies['adminLanguage']
     T.force(request.cookies['adminLanguage'].value)
 
 #set static_version
-response.static_version = open('VERSION').read().split(' ',1)[1].split('-')[0]
+from gluon.settings import global_settings
+response.static_version = global_settings.web2py_version.split('-')[0]
+response.static_version_urls = True

applications/admin/models/access.py

@@ -1,9 +1,10 @@
 import base64
 import os
 import time
-from gluon import portalocker
 from gluon.admin import apath
 from gluon.fileutils import read_file
+from gluon.utils import web2py_uuid
+from pydal.contrib import portalocker
 # ###########################################################
 # ## make sure administrator is on localhost or https
 # ###########################################################
@@ -19,7 +20,7 @@ if request.env.web2py_runtime_gae:
 else:
     is_gae = False
 
-if request.env.http_x_forwarded_for or request.is_https:
+if request.is_https:
     session.secure()
 elif not request.is_local and not DEMO_MODE:
     raise HTTP(200, T('Admin is disabled because insecure channel'))
@@ -49,15 +50,18 @@ except IOError:
 def verify_password(password):
     session.pam_user = None
     if DEMO_MODE:
-        return True
+        ret = True
     elif not _config.get('password'):
-        return False
+        ret = False
     elif _config['password'].startswith('pam_user:'):
         session.pam_user = _config['password'][9:].strip()
         import gluon.contrib.pam
-        return gluon.contrib.pam.authenticate(session.pam_user, password)
+        ret = gluon.contrib.pam.authenticate(session.pam_user, password)
     else:
-        return _config['password'] == CRYPT()(password)[0]
+        ret = _config['password'] == CRYPT()(password)[0]
+    if ret:
+        session.hmac_key = web2py_uuid()
+    return ret
 
 
 # ###########################################################
@@ -100,13 +104,12 @@ def write_hosts_deny(denied_hosts):
     portalocker.unlock(f)
     f.close()
 
-
 def login_record(success=True):
     denied_hosts = read_hosts_deny()
     val = (0, 0)
     if success and request.client in denied_hosts:
         del denied_hosts[request.client]
-    elif not success and not request.is_local:
+    elif not success:
         val = denied_hosts.get(request.client, (0, 0))
         if time.time() - val[1] < expiration_failed_logins \
             and val[0] >= allowed_number_of_attempts:
@@ -117,6 +120,11 @@ def login_record(success=True):
     write_hosts_deny(denied_hosts)
     return val[0]
 
+def failed_login_count():
+    denied_hosts = read_hosts_deny()
+    val = denied_hosts.get(request.client, (0, 0))
+    return val[0]
+
 
 # ###########################################################
 # ## session expiration

applications/admin/models/menu.py

@@ -34,4 +34,3 @@ else:
                           URL(_a, 'default', f='logout')))
     response.menu.append((T('Debug'), False,
                           URL(_a, 'debug', 'interact')))
-

applications/admin/models/plugin_statebutton.py

@@ -7,11 +7,10 @@ def stateWidget(field, value, data={'on-label':'Enabled', 'off-label':'Disabled'
     except:
         fieldName = field
 
-    div = DIV(INPUT( _type='checkbox', _name='%s' % fieldName, _checked= 'checked' if value == 'true' else None, _value='true'), 
-              _class='make-bootstrap-switch', 
+    div = DIV(INPUT( _type='checkbox', _name='%s' % fieldName, _checked= 'checked' if value == 'true' else None, _value='true'),
+              _class='make-bootstrap-switch',
               data=data)
     script = SCRIPT("""
         jQuery(".make-bootstrap-switch input[name='%s']").parent().bootstrapSwitch();
     """ % fieldName)
     return DIV(div, script)
-

applications/admin/static/codemirror/CONTRIBUTING.md

@@ -1,72 +0,0 @@
-# How to contribute
-
-- [Getting help](#getting-help-)
-- [Submitting bug reports](#submitting-bug-reports-)
-- [Contributing code](#contributing-code-)
-
-## Getting help
-
-Community discussion, questions, and informal bug reporting is done on the
-[CodeMirror Google group](http://groups.google.com/group/codemirror).
-
-## Submitting bug reports
-
-The preferred way to report bugs is to use the
-[GitHub issue tracker](http://github.com/marijnh/CodeMirror/issues). Before
-reporting a bug, read these pointers.
-
-**Note:** The issue tracker is for *bugs*, not requests for help. Questions
-should be asked on the
-[CodeMirror Google group](http://groups.google.com/group/codemirror) instead.
-
-### Reporting bugs effectively
-
-- CodeMirror is maintained by volunteers. They don't owe you anything, so be
-  polite. Reports with an indignant or belligerent tone tend to be moved to the
-  bottom of the pile.
-
-- Include information about **the browser in which the problem occurred**. Even
-  if you tested several browsers, and the problem occurred in all of them,
-  mention this fact in the bug report. Also include browser version numbers and
-  the operating system that you're on.
-
-- Mention which release of CodeMirror you're using. Preferably, try also with
-  the current development snapshot, to ensure the problem has not already been
-  fixed.
-
-- Mention very precisely what went wrong. "X is broken" is not a good bug
-  report. What did you expect to happen? What happened instead? Describe the
-  exact steps a maintainer has to take to make the problem occur. We can not
-  fix something that we can not observe.
-
-- If the problem can not be reproduced in any of the demos included in the
-  CodeMirror distribution, please provide an HTML document that demonstrates
-  the problem. The best way to do this is to go to
-  [jsbin.com](http://jsbin.com/ihunin/edit), enter it there, press save, and
-  include the resulting link in your bug report.
-
-## Contributing code
-
-- Make sure you have a [GitHub Account](https://github.com/signup/free)
-- Fork [CodeMirror](https://github.com/marijnh/CodeMirror/)
-  ([how to fork a repo](https://help.github.com/articles/fork-a-repo))
-- Make your changes
-- If your changes are easy to test or likely to regress, add tests.
-  Tests for the core go into `test/test.js`, some modes have their own
-  test suite under `mode/XXX/test.js`. Feel free to add new test
-  suites to modes that don't have one yet (be sure to link the new
-  tests into `test/index.html`).
-- Follow the general code style of the rest of the project (see
-  below). Run `bin/lint` to verify that the linter is happy.
-- Make sure all tests pass. Visit `test/index.html` in your browser to
-  run them.
-- Submit a pull request
-([how to create a pull request](https://help.github.com/articles/fork-a-repo))
-
-### Coding standards
-
-- 2 spaces per indentation level, no tabs.
-- Include semicolons after statements.
-- Note that the linter (`bin/lint`) which is run after each commit
-  complains about unused variables and functions. Prefix their names
-  with an underscore to muffle it.

applications/admin/static/codemirror/README.md

@@ -1,11 +0,0 @@
-# CodeMirror
-[![Build Status](https://secure.travis-ci.org/marijnh/CodeMirror.png?branch=master)](http://travis-ci.org/marijnh/CodeMirror)
-[![NPM version](https://badge.fury.io/js/codemirror.png)](http://badge.fury.io/js/codemirror)
-
-CodeMirror is a JavaScript component that provides a code editor in
-the browser. When a mode is available for the language you are coding
-in, it will color your code, and optionally help with indentation.
-
-The project page is http://codemirror.net  
-The manual is at http://codemirror.net/doc/manual.html  
-The contributing guidelines are in [CONTRIBUTING.md](https://github.com/marijnh/CodeMirror/blob/master/CONTRIBUTING.md)

applications/admin/static/codemirror/addon/comment/comment.js

@@ -1,4 +1,14 @@
-(function() {
+// 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 noOptions = {};
@@ -11,8 +21,21 @@
   }
 
   CodeMirror.commands.toggleComment = function(cm) {
-    var from = cm.getCursor("start"), to = cm.getCursor("end");
-    cm.uncomment(from, to) || cm.lineComment(from, to);
+    var minLine = Infinity, ranges = cm.listSelections(), mode = null;
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      if (from.line >= minLine) continue;
+      if (to.line >= minLine) to = Pos(minLine, 0);
+      minLine = from.line;
+      if (mode == null) {
+        if (cm.uncomment(from, to)) mode = "un";
+        else { cm.lineComment(from, to); mode = "line"; }
+      } else if (mode == "un") {
+        cm.uncomment(from, to);
+      } else {
+        cm.lineComment(from, to);
+      }
+    }
   };
 
   CodeMirror.defineExtension("lineComment", function(from, to, options) {
@@ -86,7 +109,7 @@
   CodeMirror.defineExtension("uncomment", function(from, to, options) {
     if (!options) options = noOptions;
     var self = this, mode = self.getModeAt(from);
-    var end = Math.min(to.line, self.lastLine()), start = Math.min(from.line, end);
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
 
     // Try finding line comments
     var lineString = options.lineComment || mode.lineComment, lines = [];
@@ -130,6 +153,17 @@
         !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
       return false;
 
+    // Avoid killing block comments completely outside the selection.
+    // Positions of the last startString before the start of the selection, and the first endString after it.
+    var lastStart = startLine.lastIndexOf(startString, from.ch);
+    var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length);
+    if (lastStart != -1 && firstEnd != -1 && firstEnd + endString.length != from.ch) return false;
+    // Positions of the first endString after the end of the selection, and the last startString before it.
+    firstEnd = endLine.indexOf(endString, to.ch);
+    var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch);
+    lastStart = (firstEnd == -1 || almostLastStart == -1) ? -1 : to.ch + almostLastStart;
+    if (firstEnd != -1 && lastStart != -1 && lastStart != to.ch) return false;
+
     self.operation(function() {
       self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
                         Pos(end, close + endString.length));
@@ -146,4 +180,4 @@
     });
     return true;
   });
-})();
+});

applications/admin/static/codemirror/addon/comment/continuecomment.js

@@ -0,0 +1,85 @@
+// 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) {
+  var modes = ["clike", "css", "javascript"];
+
+  for (var i = 0; i < modes.length; ++i)
+    CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
+
+  function continueComment(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), mode, inserts = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var pos = ranges[i].head, token = cm.getTokenAt(pos);
+      if (token.type != "comment") return CodeMirror.Pass;
+      var modeHere = CodeMirror.innerMode(cm.getMode(), token.state).mode;
+      if (!mode) mode = modeHere;
+      else if (mode != modeHere) return CodeMirror.Pass;
+
+      var insert = null;
+      if (mode.blockCommentStart && mode.blockCommentContinue) {
+        var end = token.string.indexOf(mode.blockCommentEnd);
+        var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
+        if (end != -1 && end == token.string.length - mode.blockCommentEnd.length && pos.ch >= end) {
+          // Comment ended, don't continue it
+        } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
+          insert = full.slice(0, token.start);
+          if (!/^\s*$/.test(insert)) {
+            insert = "";
+            for (var j = 0; j < token.start; ++j) insert += " ";
+          }
+        } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
+                   found + mode.blockCommentContinue.length > token.start &&
+                   /^\s*$/.test(full.slice(0, found))) {
+          insert = full.slice(0, found);
+        }
+        if (insert != null) insert += mode.blockCommentContinue;
+      }
+      if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
+        var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
+        if (found > -1) {
+          insert = line.slice(0, found);
+          if (/\S/.test(insert)) insert = null;
+          else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
+        }
+      }
+      if (insert == null) return CodeMirror.Pass;
+      inserts[i] = "\n" + insert;
+    }
+
+    cm.operation(function() {
+      for (var i = ranges.length - 1; i >= 0; i--)
+        cm.replaceRange(inserts[i], ranges[i].from(), ranges[i].to(), "+insert");
+    });
+  }
+
+  function continueLineCommentEnabled(cm) {
+    var opt = cm.getOption("continueComments");
+    if (opt && typeof opt == "object")
+      return opt.continueLineComment !== false;
+    return true;
+  }
+
+  CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {
+    if (prev && prev != CodeMirror.Init)
+      cm.removeKeyMap("continueComment");
+    if (val) {
+      var key = "Enter";
+      if (typeof val == "string")
+        key = val;
+      else if (typeof val == "object" && val.key)
+        key = val.key;
+      var map = {name: "continueComment"};
+      map[key] = continueComment;
+      cm.addKeyMap(map);
+    }
+  });
+});

applications/admin/static/codemirror/addon/dialog/dialog.js

@@ -1,15 +1,25 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Open simple dialogs on top of an editor. Relies on dialog.css.
 
-(function() {
+(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) {
   function dialogDiv(cm, template, bottom) {
     var wrap = cm.getWrapperElement();
     var dialog;
     dialog = wrap.appendChild(document.createElement("div"));
-    if (bottom) {
+    if (bottom)
       dialog.className = "CodeMirror-dialog CodeMirror-dialog-bottom";
-    } else {
+    else
       dialog.className = "CodeMirror-dialog CodeMirror-dialog-top";
-    }
+
     if (typeof template == "string") {
       dialog.innerHTML = template;
     } else { // Assuming it's a detached DOM element.
@@ -25,39 +35,59 @@
   }
 
   CodeMirror.defineExtension("openDialog", function(template, callback, options) {
+    if (!options) options = {};
+
     closeNotification(this, null);
-    var dialog = dialogDiv(this, template, options && options.bottom);
+
+    var dialog = dialogDiv(this, template, options.bottom);
     var closed = false, me = this;
-    function close() {
-      if (closed) return;
-      closed = true;
-      dialog.parentNode.removeChild(dialog);
+    function close(newVal) {
+      if (typeof newVal == 'string') {
+        inp.value = newVal;
+      } else {
+        if (closed) return;
+        closed = true;
+        dialog.parentNode.removeChild(dialog);
+        me.focus();
+
+        if (options.onClose) options.onClose(dialog);
+      }
     }
+
     var inp = dialog.getElementsByTagName("input")[0], button;
     if (inp) {
-      if (options && options.value) inp.value = options.value;
+      if (options.value) {
+        inp.value = options.value;
+        inp.select();
+      }
+
+      if (options.onInput)
+        CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});
+      if (options.onKeyUp)
+        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
+
       CodeMirror.on(inp, "keydown", function(e) {
         if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
-        if (e.keyCode == 13 || e.keyCode == 27) {
+        if (e.keyCode == 27 || (options.closeOnEnter !== false && e.keyCode == 13)) {
+          inp.blur();
           CodeMirror.e_stop(e);
           close();
-          me.focus();
-          if (e.keyCode == 13) callback(inp.value);
         }
+        if (e.keyCode == 13) callback(inp.value, e);
       });
-      if (options && options.onKeyUp) {
-        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
-      }
-      if (options && options.value) inp.value = options.value;
+
+      if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close);
+
       inp.focus();
-      CodeMirror.on(inp, "blur", close);
     } else if (button = dialog.getElementsByTagName("button")[0]) {
       CodeMirror.on(button, "click", function() {
         close();
         me.focus();
       });
+
+      if (options.closeOnBlur !== false) CodeMirror.on(button, "blur", close);
+
       button.focus();
-      CodeMirror.on(button, "blur", close);
     }
     return close;
   });
@@ -102,8 +132,8 @@
   CodeMirror.defineExtension("openNotification", function(template, options) {
     closeNotification(this, close);
     var dialog = dialogDiv(this, template, options && options.bottom);
-    var duration = options && (options.duration === undefined ? 5000 : options.duration);
     var closed = false, doneTimer;
+    var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000;
 
     function close() {
       if (closed) return;
@@ -116,7 +146,10 @@
       CodeMirror.e_preventDefault(e);
       close();
     });
+
     if (duration)
-      doneTimer = setTimeout(close, options.duration);
+      doneTimer = setTimeout(close, duration);
+
+    return close;
   });
-})();
+});

applications/admin/static/codemirror/addon/display/fullscreen.js

@@ -1,4 +1,14 @@
-(function() {
+// 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.defineOption("fullScreen", false, function(cm, val, old) {
@@ -28,4 +38,4 @@
     window.scrollTo(info.scrollLeft, info.scrollTop);
     cm.refresh();
   }
-})();
+});

applications/admin/static/codemirror/addon/display/panel.js

@@ -0,0 +1,94 @@
+// 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) {
+  CodeMirror.defineExtension("addPanel", function(node, options) {
+    if (!this.state.panels) initPanels(this);
+
+    var info = this.state.panels;
+    if (options && options.position == "bottom")
+      info.wrapper.appendChild(node);
+    else
+      info.wrapper.insertBefore(node, info.wrapper.firstChild);
+    var height = (options && options.height) || node.offsetHeight;
+    this._setSize(null, info.heightLeft -= height);
+    info.panels++;
+    return new Panel(this, node, options, height);
+  });
+
+  function Panel(cm, node, options, height) {
+    this.cm = cm;
+    this.node = node;
+    this.options = options;
+    this.height = height;
+    this.cleared = false;
+  }
+
+  Panel.prototype.clear = function() {
+    if (this.cleared) return;
+    this.cleared = true;
+    var info = this.cm.state.panels;
+    this.cm._setSize(null, info.heightLeft += this.height);
+    info.wrapper.removeChild(this.node);
+    if (--info.panels == 0) removePanels(this.cm);
+  };
+
+  Panel.prototype.changed = function(height) {
+    var newHeight = height == null ? this.node.offsetHeight : height;
+    var info = this.cm.state.panels;
+    this.cm._setSize(null, info.height += (newHeight - this.height));
+    this.height = newHeight;
+  };
+
+  function initPanels(cm) {
+    var wrap = cm.getWrapperElement();
+    var style = window.getComputedStyle ? window.getComputedStyle(wrap) : wrap.currentStyle;
+    var height = parseInt(style.height);
+    var info = cm.state.panels = {
+      setHeight: wrap.style.height,
+      heightLeft: height,
+      panels: 0,
+      wrapper: document.createElement("div")
+    };
+    wrap.parentNode.insertBefore(info.wrapper, wrap);
+    var hasFocus = cm.hasFocus();
+    info.wrapper.appendChild(wrap);
+    if (hasFocus) cm.focus();
+
+    cm._setSize = cm.setSize;
+    if (height != null) cm.setSize = function(width, newHeight) {
+      if (newHeight == null) return this._setSize(width, newHeight);
+      info.setHeight = newHeight;
+      if (typeof newHeight != "number") {
+        var px = /^(\d+\.?\d*)px$/.exec(newHeight);
+        if (px) {
+          newHeight = Number(px[1]);
+        } else {
+          info.wrapper.style.height = newHeight;
+          newHeight = info.wrapper.offsetHeight;
+          info.wrapper.style.height = "";
+        }
+      }
+      cm._setSize(width, info.heightLeft += (newHeight - height));
+      height = newHeight;
+    };
+  }
+
+  function removePanels(cm) {
+    var info = cm.state.panels;
+    cm.state.panels = null;
+
+    var wrap = cm.getWrapperElement();
+    info.wrapper.parentNode.replaceChild(wrap, info.wrapper);
+    wrap.style.height = info.setHeight;
+    cm.setSize = cm._setSize;
+    cm.setSize();
+  }
+});

applications/admin/static/codemirror/addon/display/placeholder.js

@@ -1,4 +1,14 @@
-(function() {
+// 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) {
   CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
     if (val && !prev) {
@@ -45,4 +55,4 @@
   function isEmpty(cm) {
     return (cm.lineCount() === 1) && (cm.getLine(0) === "");
   }
-})();
+});

applications/admin/static/codemirror/addon/display/rulers.js

@@ -0,0 +1,64 @@
+// 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.defineOption("rulers", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      clearRulers(cm);
+      cm.off("refresh", refreshRulers);
+    }
+    if (val && val.length) {
+      setRulers(cm);
+      cm.on("refresh", refreshRulers);
+    }
+  });
+
+  function clearRulers(cm) {
+    for (var i = cm.display.lineSpace.childNodes.length - 1; i >= 0; i--) {
+      var node = cm.display.lineSpace.childNodes[i];
+      if (/(^|\s)CodeMirror-ruler($|\s)/.test(node.className))
+        node.parentNode.removeChild(node);
+    }
+  }
+
+  function setRulers(cm) {
+    var val = cm.getOption("rulers");
+    var cw = cm.defaultCharWidth();
+    var left = cm.charCoords(CodeMirror.Pos(cm.firstLine(), 0), "div").left;
+    var minH = cm.display.scroller.offsetHeight + 30;
+    for (var i = 0; i < val.length; i++) {
+      var elt = document.createElement("div");
+      elt.className = "CodeMirror-ruler";
+      var col, cls = null, conf = val[i];
+      if (typeof conf == "number") {
+        col = conf;
+      } else {
+        col = conf.column;
+        if (conf.className) elt.className += " " + conf.className;
+        if (conf.color) elt.style.borderColor = conf.color;
+        if (conf.lineStyle) elt.style.borderLeftStyle = conf.lineStyle;
+        if (conf.width) elt.style.borderLeftWidth = conf.width;
+        cls = val[i].className;
+      }
+      elt.style.left = (left + col * cw) + "px";
+      elt.style.top = "-50px";
+      elt.style.bottom = "-20px";
+      elt.style.minHeight = minH + "px";
+      cm.display.lineSpace.insertBefore(elt, cm.display.cursorDiv);
+    }
+  }
+
+  function refreshRulers(cm) {
+    clearRulers(cm);
+    setRulers(cm);
+  }
+});

applications/admin/static/codemirror/addon/edit/closebrackets.js

@@ -1,84 +1,161 @@
-(function() {
+// 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) {
   var DEFAULT_BRACKETS = "()[]{}''\"\"";
+  var DEFAULT_TRIPLES = "'\"";
   var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
   var SPACE_CHAR_REGEX = /\s/;
 
+  var Pos = CodeMirror.Pos;
+
   CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
     if (old != CodeMirror.Init && old)
       cm.removeKeyMap("autoCloseBrackets");
     if (!val) return;
-    var pairs = DEFAULT_BRACKETS, explode = DEFAULT_EXPLODE_ON_ENTER;
+    var pairs = DEFAULT_BRACKETS, triples = DEFAULT_TRIPLES, explode = DEFAULT_EXPLODE_ON_ENTER;
     if (typeof val == "string") pairs = val;
     else if (typeof val == "object") {
       if (val.pairs != null) pairs = val.pairs;
+      if (val.triples != null) triples = val.triples;
       if (val.explode != null) explode = val.explode;
     }
-    var map = buildKeymap(pairs);
+    var map = buildKeymap(pairs, triples);
     if (explode) map.Enter = buildExplodeHandler(explode);
     cm.addKeyMap(map);
   });
 
   function charsAround(cm, pos) {
-    var str = cm.getRange(CodeMirror.Pos(pos.line, pos.ch - 1),
-                          CodeMirror.Pos(pos.line, pos.ch + 1));
+    var str = cm.getRange(Pos(pos.line, pos.ch - 1),
+                          Pos(pos.line, pos.ch + 1));
     return str.length == 2 ? str : null;
   }
 
-  function buildKeymap(pairs) {
+  // Project the token type that will exists after the given char is
+  // typed, and use it to determine whether it would cause the start
+  // of a string token.
+  function enteringString(cm, pos, ch) {
+    var line = cm.getLine(pos.line);
+    var token = cm.getTokenAt(pos);
+    if (/\bstring2?\b/.test(token.type)) return false;
+    var stream = new CodeMirror.StringStream(line.slice(0, pos.ch) + ch + line.slice(pos.ch), 4);
+    stream.pos = stream.start = token.start;
+    for (;;) {
+      var type1 = cm.getMode().token(stream, token.state);
+      if (stream.pos >= pos.ch + 1) return /\bstring2?\b/.test(type1);
+      stream.start = stream.pos;
+    }
+  }
+
+  function buildKeymap(pairs, triples) {
     var map = {
       name : "autoCloseBrackets",
       Backspace: function(cm) {
-        if (cm.somethingSelected() || cm.getOption("disableInput")) return CodeMirror.Pass;
-        var cur = cm.getCursor(), around = charsAround(cm, cur);
-        if (around && pairs.indexOf(around) % 2 == 0)
-          cm.replaceRange("", CodeMirror.Pos(cur.line, cur.ch - 1), CodeMirror.Pos(cur.line, cur.ch + 1));
-        else
-          return CodeMirror.Pass;
+        if (cm.getOption("disableInput")) return CodeMirror.Pass;
+        var ranges = cm.listSelections();
+        for (var i = 0; i < ranges.length; i++) {
+          if (!ranges[i].empty()) return CodeMirror.Pass;
+          var around = charsAround(cm, ranges[i].head);
+          if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+        }
+        for (var i = ranges.length - 1; i >= 0; i--) {
+          var cur = ranges[i].head;
+          cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
+        }
       }
     };
     var closingBrackets = "";
     for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
-      if (left != right) closingBrackets += right;
-      function surround(cm) {
-        var selection = cm.getSelection();
-        cm.replaceSelection(left + selection + right);
-      }
-      function maybeOverwrite(cm) {
-        var cur = cm.getCursor(), ahead = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1));
-        if (ahead != right || cm.somethingSelected()) return CodeMirror.Pass;
-        else cm.execCommand("goCharRight");
-      }
+      closingBrackets += right;
       map["'" + left + "'"] = function(cm) {
-        if (left == "'" && cm.getTokenAt(cm.getCursor()).type == "comment" ||
-            cm.getOption("disableInput"))
-          return CodeMirror.Pass;
-        if (cm.somethingSelected()) return surround(cm);
-        if (left == right && maybeOverwrite(cm) != CodeMirror.Pass) return;
-        var cur = cm.getCursor(), ahead = CodeMirror.Pos(cur.line, cur.ch + 1);
-        var line = cm.getLine(cur.line), nextChar = line.charAt(cur.ch), curChar = cur.ch > 0 ? line.charAt(cur.ch - 1) : "";
-        if (left == right && CodeMirror.isWordChar(curChar))
-          return CodeMirror.Pass;
-        if (line.length == cur.ch || closingBrackets.indexOf(nextChar) >= 0 || SPACE_CHAR_REGEX.test(nextChar))
-          cm.replaceSelection(left + right, {head: ahead, anchor: ahead});
-        else
-          return CodeMirror.Pass;
+        if (cm.getOption("disableInput")) return CodeMirror.Pass;
+        var ranges = cm.listSelections(), type, next;
+        for (var i = 0; i < ranges.length; i++) {
+          var range = ranges[i], cur = range.head, curType;
+          var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
+          if (!range.empty()) {
+            curType = "surround";
+          } else if (left == right && next == right) {
+            if (cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == left + left + left)
+              curType = "skipThree";
+            else
+              curType = "skip";
+          } else if (left == right && cur.ch > 1 && triples.indexOf(left) >= 0 &&
+                     cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
+                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left)) {
+            curType = "addFour";
+          } else if (left == '"' || left == "'") {
+            if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, left)) curType = "both";
+            else return CodeMirror.Pass;
+          } else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next)) {
+            curType = "both";
+          } else {
+            return CodeMirror.Pass;
+          }
+          if (!type) type = curType;
+          else if (type != curType) return CodeMirror.Pass;
+        }
+
+        cm.operation(function() {
+          if (type == "skip") {
+            cm.execCommand("goCharRight");
+          } else if (type == "skipThree") {
+            for (var i = 0; i < 3; i++)
+              cm.execCommand("goCharRight");
+          } else if (type == "surround") {
+            var sels = cm.getSelections();
+            for (var i = 0; i < sels.length; i++)
+              sels[i] = left + sels[i] + right;
+            cm.replaceSelections(sels, "around");
+          } else if (type == "both") {
+            cm.replaceSelection(left + right, null);
+            cm.execCommand("goCharLeft");
+          } else if (type == "addFour") {
+            cm.replaceSelection(left + left + left + left, "before");
+            cm.execCommand("goCharRight");
+          }
+        });
+      };
+      if (left != right) map["'" + right + "'"] = function(cm) {
+        var ranges = cm.listSelections();
+        for (var i = 0; i < ranges.length; i++) {
+          var range = ranges[i];
+          if (!range.empty() ||
+              cm.getRange(range.head, Pos(range.head.line, range.head.ch + 1)) != right)
+            return CodeMirror.Pass;
+        }
+        cm.execCommand("goCharRight");
       };
-      if (left != right) map["'" + right + "'"] = maybeOverwrite;
     })(pairs.charAt(i), pairs.charAt(i + 1));
     return map;
   }
 
   function buildExplodeHandler(pairs) {
     return function(cm) {
-      var cur = cm.getCursor(), around = charsAround(cm, cur);
-      if (!around || pairs.indexOf(around) % 2 != 0 || cm.getOption("disableInput"))
-        return CodeMirror.Pass;
+      if (cm.getOption("disableInput")) return CodeMirror.Pass;
+      var ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        if (!ranges[i].empty()) return CodeMirror.Pass;
+        var around = charsAround(cm, ranges[i].head);
+        if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+      }
       cm.operation(function() {
-        var newPos = CodeMirror.Pos(cur.line + 1, 0);
-        cm.replaceSelection("\n\n", {anchor: newPos, head: newPos}, "+input");
-        cm.indentLine(cur.line + 1, null, true);
-        cm.indentLine(cur.line + 2, null, true);
+        cm.replaceSelection("\n\n", null);
+        cm.execCommand("goCharLeft");
+        ranges = cm.listSelections();
+        for (var i = 0; i < ranges.length; i++) {
+          var line = ranges[i].head.line;
+          cm.indentLine(line, null, true);
+          cm.indentLine(line + 1, null, true);
+        }
       });
     };
   }
-})();
+});

applications/admin/static/codemirror/addon/edit/closetag.js

@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
  * Tag-closer extension for CodeMirror.
  *
@@ -22,7 +25,14 @@
  * See demos/closetag.html for a usage example.
  */
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   CodeMirror.defineOption("autoCloseTags", false, function(cm, val, old) {
     if (old != CodeMirror.Init && old)
       cm.removeKeyMap("autoCloseTags");
@@ -41,53 +51,116 @@
                     "h5", "h6", "head", "html", "iframe", "layer", "legend", "object", "ol", "p", "select", "table", "ul"];
 
   function autoCloseGT(cm) {
-    var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
-    var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (inner.mode.name != "xml" || !state.tagName || cm.getOption("disableInput")) return CodeMirror.Pass;
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), replacements = [];
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
 
-    var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
-    var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
-    var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
+      var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
+      var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
+      var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
 
-    var tagName = state.tagName;
-    if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
-    var lowerTagName = tagName.toLowerCase();
-    // Don't process the '>' at the end of an end-tag or self-closing tag
-    if (!tagName ||
-        tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
-        tok.type == "tag" && state.type == "closeTag" ||
-        tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
-        dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
-        CodeMirror.scanForClosingTag && CodeMirror.scanForClosingTag(cm, pos, tagName,
-                                                                     Math.min(cm.lastLine() + 1, pos.line + 50)))
-      return CodeMirror.Pass;
+      var tagName = state.tagName;
+      if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
+      var lowerTagName = tagName.toLowerCase();
+      // Don't process the '>' at the end of an end-tag or self-closing tag
+      if (!tagName ||
+          tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
+          tok.type == "tag" && state.type == "closeTag" ||
+          tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
+          dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
+          closingTagExists(cm, tagName, pos, state, true))
+        return CodeMirror.Pass;
 
-    var doIndent = indentTags && indexOf(indentTags, lowerTagName) > -1;
-    var curPos = doIndent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1);
-    cm.replaceSelection(">" + (doIndent ? "\n\n" : "") + "</" + tagName + ">",
-                        {head: curPos, anchor: curPos});
-    if (doIndent) {
-      cm.indentLine(pos.line + 1, null, true);
-      cm.indentLine(pos.line + 2, null);
+      var indent = indentTags && indexOf(indentTags, lowerTagName) > -1;
+      replacements[i] = {indent: indent,
+                         text: ">" + (indent ? "\n\n" : "") + "</" + tagName + ">",
+                         newPos: indent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1)};
+    }
+
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var info = replacements[i];
+      cm.replaceRange(info.text, ranges[i].head, ranges[i].anchor, "+insert");
+      var sel = cm.listSelections().slice(0);
+      sel[i] = {head: info.newPos, anchor: info.newPos};
+      cm.setSelections(sel);
+      if (info.indent) {
+        cm.indentLine(info.newPos.line, null, true);
+        cm.indentLine(info.newPos.line + 1, null, true);
+      }
     }
   }
 
-  function autoCloseSlash(cm) {
-    var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
-    var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (tok.type == "string" || tok.string.charAt(0) != "<" ||
-        tok.start != pos.ch - 1 || inner.mode.name != "xml" ||
-        cm.getOption("disableInput"))
-      return CodeMirror.Pass;
-
-    var tagName = state.context && state.context.tagName;
-    if (tagName) cm.replaceSelection("/" + tagName + ">", "end");
+  function autoCloseCurrent(cm, typingSlash) {
+    var ranges = cm.listSelections(), replacements = [];
+    var head = typingSlash ? "/" : "</";
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (typingSlash && (tok.type == "string" || tok.string.charAt(0) != "<" ||
+                          tok.start != pos.ch - 1))
+        return CodeMirror.Pass;
+      // Kludge to get around the fact that we are not in XML mode
+      // when completing in JS/CSS snippet in htmlmixed mode. Does not
+      // work for other XML embedded languages (there is no general
+      // way to go from a mixed mode to its current XML state).
+      if (inner.mode.name != "xml") {
+        if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
+          replacements[i] = head + "script>";
+        else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
+          replacements[i] = head + "style>";
+        else
+          return CodeMirror.Pass;
+      } else {
+        if (!state.context || !state.context.tagName ||
+            closingTagExists(cm, state.context.tagName, pos, state))
+          return CodeMirror.Pass;
+        replacements[i] = head + state.context.tagName + ">";
+      }
+    }
+    cm.replaceSelections(replacements);
+    ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++)
+      if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
+        cm.indentLine(ranges[i].head.line);
   }
 
+  function autoCloseSlash(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    return autoCloseCurrent(cm, true);
+  }
+
+  CodeMirror.commands.closeTag = function(cm) { return autoCloseCurrent(cm); };
+
   function indexOf(collection, elt) {
     if (collection.indexOf) return collection.indexOf(elt);
     for (var i = 0, e = collection.length; i < e; ++i)
       if (collection[i] == elt) return i;
     return -1;
   }
-})();
+
+  // If xml-fold is loaded, we use its functionality to try and verify
+  // whether a given tag is actually unclosed.
+  function closingTagExists(cm, tagName, pos, state, newTag) {
+    if (!CodeMirror.scanForClosingTag) return false;
+    var end = Math.min(cm.lastLine() + 1, pos.line + 500);
+    var nextClose = CodeMirror.scanForClosingTag(cm, pos, null, end);
+    if (!nextClose || nextClose.tag != tagName) return false;
+    var cx = state.context;
+    // If the immediate wrapping context contains onCx instances of
+    // the same tag, a closing tag only exists if there are at least
+    // that many closing tags of that type following.
+    for (var onCx = newTag ? 1 : 0; cx && cx.tagName == tagName; cx = cx.prev) ++onCx;
+    pos = nextClose.to;
+    for (var i = 1; i < onCx; i++) {
+      var next = CodeMirror.scanForClosingTag(cm, pos, null, end);
+      if (!next || next.tag != tagName) return false;
+      pos = next.to;
+    }
+    return true;
+  }
+});

applications/admin/static/codemirror/addon/edit/continuelist.js

@@ -1,27 +1,51 @@
-(function() {
-  'use strict';
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
 
-  var listRE = /^(\s*)([*+-]|(\d+)\.)(\s*)/,
-      unorderedBullets = '*+-';
+(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 listRE = /^(\s*)(>[> ]*|[*+-]\s|(\d+)\.)(\s*)/,
+      emptyListRE = /^(\s*)(>[> ]*|[*+-]|(\d+)\.)(\s*)$/,
+      unorderedListRE = /[*+-]\s/;
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), replacements = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var pos = ranges[i].head, match;
+      var eolState = cm.getStateAfter(pos.line);
+      var inList = eolState.list !== false;
+      var inQuote = eolState.quote !== false;
 
-    var pos = cm.getCursor(),
-        inList = cm.getStateAfter(pos.line).list !== false,
-        match;
+      if (!ranges[i].empty() || (!inList && !inQuote) || !(match = cm.getLine(pos.line).match(listRE))) {
+        cm.execCommand("newlineAndIndent");
+        return;
+      }
+      if (cm.getLine(pos.line).match(emptyListRE)) {
+        cm.replaceRange("", {
+          line: pos.line, ch: 0
+        }, {
+          line: pos.line, ch: pos.ch + 1
+        });
+        replacements[i] = "\n";
 
-    if (!inList || !(match = cm.getLine(pos.line).match(listRE))) {
-      cm.execCommand('newlineAndIndent');
-      return;
+      } else {
+        var indent = match[1], after = match[4];
+        var bullet = unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0
+          ? match[2]
+          : (parseInt(match[3], 10) + 1) + ".";
+
+        replacements[i] = "\n" + indent + bullet + after;
+      }
     }
 
-    var indent = match[1], after = match[4];
-    var bullet = unorderedBullets.indexOf(match[2]) >= 0
-      ? match[2]
-      : (parseInt(match[3], 10) + 1) + '.';
-
-    cm.replaceSelection('\n' + indent + bullet + after, 'end');
+    cm.replaceSelections(replacements);
   };
-
-}());
+});

applications/admin/static/codemirror/addon/edit/matchbrackets.js

@@ -1,73 +1,103 @@
-(function() {
+// 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) {
   var ie_lt8 = /MSIE \d/.test(navigator.userAgent) &&
     (document.documentMode == null || document.documentMode < 8);
 
   var Pos = CodeMirror.Pos;
 
   var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
-  function findMatchingBracket(cm, where, strict) {
-    var state = cm.state.matchBrackets;
-    var maxScanLen = (state && state.maxScanLineLength) || 10000;
-    var maxScanLines = (state && state.maxScanLines) || 100;
 
-    var cur = where || cm.getCursor(), line = cm.getLineHandle(cur.line), pos = cur.ch - 1;
+  function findMatchingBracket(cm, where, strict, config) {
+    var line = cm.getLineHandle(where.line), pos = where.ch - 1;
     var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
     if (!match) return null;
-    var forward = match.charAt(1) == ">", d = forward ? 1 : -1;
-    if (strict && forward != (pos == cur.ch)) return null;
-    var style = cm.getTokenTypeAt(Pos(cur.line, pos + 1));
+    var dir = match.charAt(1) == ">" ? 1 : -1;
+    if (strict && (dir > 0) != (pos == where.ch)) return null;
+    var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
-    var stack = [line.text.charAt(pos)], re = /[(){}[\]]/;
-    function scan(line, lineNo, start) {
-      if (!line.text) return;
-      var pos = forward ? 0 : line.text.length - 1, end = forward ? line.text.length : -1;
-      if (line.text.length > maxScanLen) return null;
-      if (start != null) pos = start + d;
-      for (; pos != end; pos += d) {
-        var ch = line.text.charAt(pos);
-        if (re.test(ch) && cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style) {
+    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
+    if (found == null) return null;
+    return {from: Pos(where.line, pos), to: found && found.pos,
+            match: found && found.ch == match.charAt(0), forward: dir > 0};
+  }
+
+  // bracketRegex is used to specify which type of bracket to scan
+  // should be a regexp, e.g. /[[\]]/
+  //
+  // Note: If "where" is on an open bracket, then this bracket is ignored.
+  //
+  // Returns false when no bracket was found, null when it reached
+  // maxScanLines and gave up
+  function scanForBracket(cm, where, dir, style, config) {
+    var maxScanLen = (config && config.maxScanLineLength) || 10000;
+    var maxScanLines = (config && config.maxScanLines) || 1000;
+
+    var stack = [];
+    var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]]/;
+    var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
+                          : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
+    for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
+      var line = cm.getLine(lineNo);
+      if (!line) continue;
+      var pos = dir > 0 ? 0 : line.length - 1, end = dir > 0 ? line.length : -1;
+      if (line.length > maxScanLen) continue;
+      if (lineNo == where.line) pos = where.ch - (dir < 0 ? 1 : 0);
+      for (; pos != end; pos += dir) {
+        var ch = line.charAt(pos);
+        if (re.test(ch) && (style === undefined || cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style)) {
           var match = matching[ch];
-          if (match.charAt(1) == ">" == forward) stack.push(ch);
-          else if (stack.pop() != match.charAt(0)) return {pos: pos, match: false};
-          else if (!stack.length) return {pos: pos, match: true};
+          if ((match.charAt(1) == ">") == (dir > 0)) stack.push(ch);
+          else if (!stack.length) return {pos: Pos(lineNo, pos), ch: ch};
+          else stack.pop();
         }
       }
     }
-    for (var i = cur.line, found, e = forward ? Math.min(i + maxScanLines, cm.lineCount()) : Math.max(-1, i - maxScanLines); i != e; i+=d) {
-      if (i == cur.line) found = scan(line, i, pos);
-      else found = scan(cm.getLineHandle(i), i);
-      if (found) break;
-    }
-    return {from: Pos(cur.line, pos), to: found && Pos(i, found.pos),
-            match: found && found.match, forward: forward};
+    return lineNo - dir == (dir > 0 ? cm.lastLine() : cm.firstLine()) ? false : null;
   }
 
-  function matchBrackets(cm, autoclear) {
+  function matchBrackets(cm, autoclear, config) {
     // Disable brace matching in long lines, since it'll cause hugely slow updates
     var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
-    var found = findMatchingBracket(cm);
-    if (!found || cm.getLine(found.from.line).length > maxHighlightLen ||
-       found.to && cm.getLine(found.to.line).length > maxHighlightLen)
-      return;
+    var marks = [], ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, false, config);
+      if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
+        var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
+        marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
+        if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen)
+          marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), {className: style}));
+      }
+    }
 
-    var style = found.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
-    var one = cm.markText(found.from, Pos(found.from.line, found.from.ch + 1), {className: style});
-    var two = found.to && cm.markText(found.to, Pos(found.to.line, found.to.ch + 1), {className: style});
-    // Kludge to work around the IE bug from issue #1193, where text
-    // input stops going to the textarea whenever this fires.
-    if (ie_lt8 && cm.state.focused) cm.display.input.focus();
-    var clear = function() {
-      cm.operation(function() { one.clear(); two && two.clear(); });
-    };
-    if (autoclear) setTimeout(clear, 800);
-    else return clear;
+    if (marks.length) {
+      // Kludge to work around the IE bug from issue #1193, where text
+      // input stops going to the textare whever this fires.
+      if (ie_lt8 && cm.state.focused) cm.display.input.focus();
+
+      var clear = function() {
+        cm.operation(function() {
+          for (var i = 0; i < marks.length; i++) marks[i].clear();
+        });
+      };
+      if (autoclear) setTimeout(clear, 800);
+      else return clear;
+    }
   }
 
   var currentlyHighlighted = null;
   function doMatchBrackets(cm) {
     cm.operation(function() {
       if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
-      if (!cm.somethingSelected()) currentlyHighlighted = matchBrackets(cm, false);
+      currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets);
     });
   }
 
@@ -81,7 +111,10 @@
   });
 
   CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
-  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict){
-    return findMatchingBracket(this, pos, strict);
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict, config){
+    return findMatchingBracket(this, pos, strict, config);
   });
-})();
+  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
+    return scanForBracket(this, pos, dir, style, config);
+  });
+});

applications/admin/static/codemirror/addon/edit/matchtags.js

@@ -0,0 +1,66 @@
+// 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("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("matchTags", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.off("cursorActivity", doMatchTags);
+      cm.off("viewportChange", maybeUpdateMatch);
+      clear(cm);
+    }
+    if (val) {
+      cm.state.matchBothTags = typeof val == "object" && val.bothTags;
+      cm.on("cursorActivity", doMatchTags);
+      cm.on("viewportChange", maybeUpdateMatch);
+      doMatchTags(cm);
+    }
+  });
+
+  function clear(cm) {
+    if (cm.state.tagHit) cm.state.tagHit.clear();
+    if (cm.state.tagOther) cm.state.tagOther.clear();
+    cm.state.tagHit = cm.state.tagOther = null;
+  }
+
+  function doMatchTags(cm) {
+    cm.state.failedTagMatch = false;
+    cm.operation(function() {
+      clear(cm);
+      if (cm.somethingSelected()) return;
+      var cur = cm.getCursor(), range = cm.getViewport();
+      range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
+      var match = CodeMirror.findMatchingTag(cm, cur, range);
+      if (!match) return;
+      if (cm.state.matchBothTags) {
+        var hit = match.at == "open" ? match.open : match.close;
+        if (hit) cm.state.tagHit = cm.markText(hit.from, hit.to, {className: "CodeMirror-matchingtag"});
+      }
+      var other = match.at == "close" ? match.open : match.close;
+      if (other)
+        cm.state.tagOther = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
+      else
+        cm.state.failedTagMatch = true;
+    });
+  }
+
+  function maybeUpdateMatch(cm) {
+    if (cm.state.failedTagMatch) doMatchTags(cm);
+  }
+
+  CodeMirror.commands.toMatchingTag = function(cm) {
+    var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
+    if (found) {
+      var other = found.at == "close" ? found.open : found.close;
+      if (other) cm.extendSelection(other.to, other.from);
+    }
+  };
+});

applications/admin/static/codemirror/addon/edit/trailingspace.js

@@ -1,15 +1,27 @@
-CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
-  if (prev == CodeMirror.Init) prev = false;
-  if (prev && !val)
-    cm.removeOverlay("trailingspace");
-  else if (!prev && val)
-    cm.addOverlay({
-      token: function(stream) {
-        for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
-        if (i > stream.pos) { stream.pos = i; return null; }
-        stream.pos = l;
-        return "trailingspace";
-      },
-      name: "trailingspace"
-    });
+// 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) {
+  CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
+    if (prev == CodeMirror.Init) prev = false;
+    if (prev && !val)
+      cm.removeOverlay("trailingspace");
+    else if (!prev && val)
+      cm.addOverlay({
+        token: function(stream) {
+          for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
+          if (i > stream.pos) { stream.pos = i; return null; }
+          stream.pos = l;
+          return "trailingspace";
+        },
+        name: "trailingspace"
+      });
+  });
 });

applications/admin/static/codemirror/addon/fold/brace-fold.js

@@ -1,3 +1,16 @@
+// 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.registerHelper("fold", "brace", function(cm, start) {
   var line = start.line, lineText = cm.getLine(line);
   var startCh, tokenType;
@@ -45,7 +58,6 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
   return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
 });
-CodeMirror.braceRangeFinder = CodeMirror.fold.brace; // deprecated
 
 CodeMirror.registerHelper("fold", "import", function(cm, start) {
   function hasImport(line) {
@@ -70,7 +82,6 @@ CodeMirror.registerHelper("fold", "import", function(cm, start) {
   }
   return {from: cm.clipPos(CodeMirror.Pos(start, has.startCh + 1)), to: end};
 });
-CodeMirror.importRangeFinder = CodeMirror.fold["import"]; // deprecated
 
 CodeMirror.registerHelper("fold", "include", function(cm, start) {
   function hasInclude(line) {
@@ -90,4 +101,5 @@ CodeMirror.registerHelper("fold", "include", function(cm, start) {
   return {from: CodeMirror.Pos(start, has + 1),
           to: cm.clipPos(CodeMirror.Pos(end))};
 });
-CodeMirror.includeRangeFinder = CodeMirror.fold.include; // deprecated
+
+});

applications/admin/static/codemirror/addon/fold/comment-fold.js

@@ -1,3 +1,16 @@
+// 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.registerGlobalHelper("fold", "comment", function(mode) {
   return mode.blockCommentStart && mode.blockCommentEnd;
 }, function(cm, start) {
@@ -40,3 +53,5 @@ CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
   return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
 });
+
+});

applications/admin/static/codemirror/addon/fold/foldcode.js

@@ -1,11 +1,25 @@
-(function() {
+// 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 doFold(cm, pos, options, force) {
-    var finder = options && (options.call ? options : options.rangeFinder);
-    if (!finder) finder = CodeMirror.fold.auto;
+    if (options && options.call) {
+      var finder = options;
+      options = null;
+    } else {
+      var finder = getOption(cm, options, "rangeFinder");
+    }
     if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
-    var minSize = options && options.minFoldSize || 0;
+    var minSize = getOption(cm, options, "minFoldSize");
 
     function getRange(allowFolded) {
       var range = finder(cm, pos);
@@ -22,14 +36,17 @@
     }
 
     var range = getRange(true);
-    if (options && options.scanUp) while (!range && pos.line > cm.firstLine()) {
+    if (getOption(cm, options, "scanUp")) while (!range && pos.line > cm.firstLine()) {
       pos = CodeMirror.Pos(pos.line - 1, 0);
       range = getRange(false);
     }
     if (!range || range.cleared || force === "unfold") return;
 
-    var myWidget = makeWidget(options);
-    CodeMirror.on(myWidget, "mousedown", function() { myRange.clear(); });
+    var myWidget = makeWidget(cm, options);
+    CodeMirror.on(myWidget, "mousedown", function(e) {
+      myRange.clear();
+      CodeMirror.e_preventDefault(e);
+    });
     var myRange = cm.markText(range.from, range.to, {
       replacedWith: myWidget,
       clearOnEnter: true,
@@ -41,8 +58,8 @@
     CodeMirror.signal(cm, "fold", cm, range.from, range.to);
   }
 
-  function makeWidget(options) {
-    var widget = (options && options.widget) || "\u2194";
+  function makeWidget(cm, options) {
+    var widget = getOption(cm, options, "widget");
     if (typeof widget == "string") {
       var text = document.createTextNode(widget);
       widget = document.createElement("span");
@@ -62,9 +79,33 @@
     doFold(this, pos, options, force);
   });
 
-  CodeMirror.commands.fold = function(cm) {
+  CodeMirror.defineExtension("isFolded", function(pos) {
+    var marks = this.findMarksAt(pos);
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold) return true;
+  });
+
+  CodeMirror.commands.toggleFold = function(cm) {
     cm.foldCode(cm.getCursor());
   };
+  CodeMirror.commands.fold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "fold");
+  };
+  CodeMirror.commands.unfold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "unfold");
+  };
+  CodeMirror.commands.foldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "fold");
+    });
+  };
+  CodeMirror.commands.unfoldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "unfold");
+    });
+  };
 
   CodeMirror.registerHelper("fold", "combine", function() {
     var funcs = Array.prototype.slice.call(arguments, 0);
@@ -83,4 +124,26 @@
       if (cur) return cur;
     }
   });
-})();
+
+  var defaultOptions = {
+    rangeFinder: CodeMirror.fold.auto,
+    widget: "\u2194",
+    minFoldSize: 0,
+    scanUp: false
+  };
+
+  CodeMirror.defineOption("foldOptions", null);
+
+  function getOption(cm, options, name) {
+    if (options && options[name] !== undefined)
+      return options[name];
+    var editorOptions = cm.options.foldOptions;
+    if (editorOptions && editorOptions[name] !== undefined)
+      return editorOptions[name];
+    return defaultOptions[name];
+  }
+
+  CodeMirror.defineExtension("foldOption", function(options, name) {
+    return getOption(this, options, name);
+  });
+});

applications/admin/static/codemirror/addon/fold/foldgutter.css

@@ -10,7 +10,6 @@
 }
 .CodeMirror-foldgutter-open,
 .CodeMirror-foldgutter-folded {
-  color: #555;
   cursor: pointer;
 }
 .CodeMirror-foldgutter-open:after {

applications/admin/static/codemirror/addon/fold/foldgutter.js

@@ -1,4 +1,14 @@
-(function() {
+// 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("./foldcode"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./foldcode"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
@@ -48,7 +58,7 @@
   function marker(spec) {
     if (typeof spec == "string") {
       var elt = document.createElement("div");
-      elt.className = spec;
+      elt.className = spec + " CodeMirror-guttermarker-subtle";
       return elt;
     } else {
       return spec.cloneNode(true);
@@ -57,14 +67,16 @@
 
   function updateFoldInfo(cm, from, to) {
     var opts = cm.state.foldGutter.options, cur = from;
+    var minSize = cm.foldOption(opts, "minFoldSize");
+    var func = cm.foldOption(opts, "rangeFinder");
     cm.eachLine(from, to, function(line) {
       var mark = null;
       if (isFolded(cm, cur)) {
         mark = marker(opts.indicatorFolded);
       } else {
-        var pos = Pos(cur, 0), func = opts.rangeFinder || CodeMirror.fold.auto;
+        var pos = Pos(cur, 0);
         var range = func && func(cm, pos);
-        if (range && range.from.line + 1 < range.to.line)
+        if (range && range.to.line - range.from.line >= minSize)
           mark = marker(opts.indicatorOpen);
       }
       cm.setGutterMarker(line, opts.gutter, mark);
@@ -82,20 +94,26 @@
   }
 
   function onGutterClick(cm, line, gutter) {
-    var opts = cm.state.foldGutter.options;
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
     if (gutter != opts.gutter) return;
     cm.foldCode(Pos(line, 0), opts.rangeFinder);
   }
 
   function onChange(cm) {
-    var state = cm.state.foldGutter, opts = cm.state.foldGutter.options;
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
     state.from = state.to = 0;
     clearTimeout(state.changeUpdate);
     state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, opts.foldOnChangeTimeSpan || 600);
   }
 
   function onViewportChange(cm) {
-    var state = cm.state.foldGutter, opts = cm.state.foldGutter.options;
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
     clearTimeout(state.changeUpdate);
     state.changeUpdate = setTimeout(function() {
       var vp = cm.getViewport();
@@ -117,8 +135,10 @@
   }
 
   function onFold(cm, from) {
-    var state = cm.state.foldGutter, line = from.line;
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var line = from.line;
     if (line >= state.from && line < state.to)
       updateFoldInfo(cm, line, line + 1);
   }
-})();
+});

applications/admin/static/codemirror/addon/fold/indent-fold.js

@@ -1,3 +1,16 @@
+// 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.registerHelper("fold", "indent", function(cm, start) {
   var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
   if (!/\S/.test(firstLine)) return;
@@ -27,4 +40,5 @@ CodeMirror.registerHelper("fold", "indent", function(cm, start) {
     to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
   };
 });
-CodeMirror.indentRangeFinder = CodeMirror.fold.indent; // deprecated
+
+});

applications/admin/static/codemirror/addon/fold/markdown-fold.js

@@ -0,0 +1,49 @@
+// 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.registerHelper("fold", "markdown", function(cm, start) {
+  var maxDepth = 100;
+
+  function isHeader(lineNo) {
+    var tokentype = cm.getTokenTypeAt(CodeMirror.Pos(lineNo, 0));
+    return tokentype && /\bheader\b/.test(tokentype);
+  }
+
+  function headerLevel(lineNo, line, nextLine) {
+    var match = line && line.match(/^#+/);
+    if (match && isHeader(lineNo)) return match[0].length;
+    match = nextLine && nextLine.match(/^[=\-]+\s*$/);
+    if (match && isHeader(lineNo + 1)) return nextLine[0] == "=" ? 1 : 2;
+    return maxDepth;
+  }
+
+  var firstLine = cm.getLine(start.line), nextLine = cm.getLine(start.line + 1);
+  var level = headerLevel(start.line, firstLine, nextLine);
+  if (level === maxDepth) return undefined;
+
+  var lastLineNo = cm.lastLine();
+  var end = start.line, nextNextLine = cm.getLine(end + 2);
+  while (end < lastLineNo) {
+    if (headerLevel(end + 1, nextLine, nextNextLine) <= level) break;
+    ++end;
+    nextLine = nextNextLine;
+    nextNextLine = cm.getLine(end + 2);
+  }
+
+  return {
+    from: CodeMirror.Pos(start.line, firstLine.length),
+    to: CodeMirror.Pos(end, cm.getLine(end).length)
+  };
+});
+
+});

applications/admin/static/codemirror/addon/fold/xml-fold.js

@@ -1,4 +1,14 @@
-(function() {
+// 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 Pos = CodeMirror.Pos;
@@ -136,15 +146,14 @@
       }
     }
   });
-  CodeMirror.tagRangeFinder = CodeMirror.fold.xml; // deprecated
-
   CodeMirror.findMatchingTag = function(cm, pos, range) {
     var iter = new Iter(cm, pos.line, pos.ch, range);
     if (iter.text.indexOf(">") == -1 && iter.text.indexOf("<") == -1) return;
     var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
     var start = end && toTagStart(iter);
-    if (!end || end == "selfClose" || !start || cmp(iter, pos) > 0) return;
+    if (!end || !start || cmp(iter, pos) > 0) return;
     var here = {from: Pos(iter.line, iter.ch), to: to, tag: start[2]};
+    if (end == "selfClose") return {open: here, close: null, at: "open"};
 
     if (start[1]) { // closing tag
       return {open: findMatchingOpen(iter, start[2]), close: here, at: "close"};
@@ -168,6 +177,6 @@
   // Used by addon/edit/closetag.js
   CodeMirror.scanForClosingTag = function(cm, pos, name, end) {
     var iter = new Iter(cm, pos.line, pos.ch, end ? {from: 0, to: end} : null);
-    return !!findMatchingClose(iter, name);
+    return findMatchingClose(iter, name);
   };
-})();
+});

applications/admin/static/codemirror/addon/hint/anyword-hint.js

@@ -0,0 +1,41 @@
+// 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 WORD = /[\w$]+/, RANGE = 500;
+
+  CodeMirror.registerHelper("hint", "anyword", function(editor, options) {
+    var word = options && options.word || WORD;
+    var range = options && options.range || RANGE;
+    var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
+    var end = cur.ch, start = end;
+    while (start && word.test(curLine.charAt(start - 1))) --start;
+    var curWord = start != end && curLine.slice(start, end);
+
+    var list = [], seen = {};
+    var re = new RegExp(word.source, "g");
+    for (var dir = -1; dir <= 1; dir += 2) {
+      var line = cur.line, endLine = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
+      for (; line != endLine; line += dir) {
+        var text = editor.getLine(line), m;
+        while (m = re.exec(text)) {
+          if (line == cur.line && m[0] === curWord) continue;
+          if ((!curWord || m[0].lastIndexOf(curWord, 0) == 0) && !Object.prototype.hasOwnProperty.call(seen, m[0])) {
+            seen[m[0]] = true;
+            list.push(m[0]);
+          }
+        }
+      }
+    }
+    return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
+  });
+});

applications/admin/static/codemirror/addon/hint/css-hint.js

@@ -0,0 +1,56 @@
+// 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("../../mode/css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../mode/css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var pseudoClasses = {link: 1, visited: 1, active: 1, hover: 1, focus: 1,
+                       "first-letter": 1, "first-line": 1, "first-child": 1,
+                       before: 1, after: 1, lang: 1};
+
+  CodeMirror.registerHelper("hint", "css", function(cm) {
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
+    if (inner.mode.name != "css") return;
+
+    var start = token.start, end = cur.ch, word = token.string.slice(0, end - start);
+    if (/[^\w$_-]/.test(word)) {
+      word = ""; start = end = cur.ch;
+    }
+
+    var spec = CodeMirror.resolveMode("text/css");
+
+    var result = [];
+    function add(keywords) {
+      for (var name in keywords)
+        if (!word || name.lastIndexOf(word, 0) == 0)
+          result.push(name);
+    }
+
+    var st = inner.state.state;
+    if (st == "pseudo" || token.type == "variable-3") {
+      add(pseudoClasses);
+    } else if (st == "block" || st == "maybeprop") {
+      add(spec.propertyKeywords);
+    } else if (st == "prop" || st == "parens" || st == "at" || st == "params") {
+      add(spec.valueKeywords);
+      add(spec.colorKeywords);
+    } else if (st == "media" || st == "media_parens") {
+      add(spec.mediaTypes);
+      add(spec.mediaFeatures);
+    }
+
+    if (result.length) return {
+      list: result,
+      from: CodeMirror.Pos(cur.line, start),
+      to: CodeMirror.Pos(cur.line, end)
+    };
+  });
+});

applications/admin/static/codemirror/addon/hint/html-hint.js

@@ -1,4 +1,16 @@
-(function () {
+// 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-hint"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./xml-hint"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
   var langs = "ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" ");
   var targets = ["_blank", "_self", "_top", "_parent"];
   var charsets = ["ascii", "utf-8", "utf-16", "latin1", "latin1"];
@@ -332,6 +344,5 @@
     if (options) for (var opt in options) local[opt] = options[opt];
     return CodeMirror.hint.xml(cm, local);
   }
-  CodeMirror.htmlHint = htmlHint; // deprecated
   CodeMirror.registerHelper("hint", "html", htmlHint);
-})();
+});

applications/admin/static/codemirror/addon/hint/javascript-hint.js

@@ -1,4 +1,14 @@
-(function () {
+// 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) {
   var Pos = CodeMirror.Pos;
 
   function forEach(arr, f) {
@@ -20,15 +30,20 @@
 
   function scriptHint(editor, keywords, getToken, options) {
     // Find the token at the cursor
-    var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
+    var cur = editor.getCursor(), token = getToken(editor, cur);
     if (/\b(?:string|comment)\b/.test(token.type)) return;
     token.state = CodeMirror.innerMode(editor.getMode(), token.state).state;
 
     // If it's not a 'word-style' token, ignore the token.
     if (!/^[\w$_]*$/.test(token.string)) {
-      token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-                       type: token.string == "." ? "property" : null};
+      token = {start: cur.ch, end: cur.ch, string: "", state: token.state,
+               type: token.string == "." ? "property" : null};
+    } else if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
     }
+
+    var tprop = token;
     // If it is a property, find out what it is a property of.
     while (tprop.type == "property") {
       tprop = getToken(editor, Pos(cur.line, tprop.start));
@@ -47,7 +62,6 @@
                       function (e, cur) {return e.getTokenAt(cur);},
                       options);
   };
-  CodeMirror.javascriptHint = javascriptHint; // deprecated
   CodeMirror.registerHelper("hint", "javascript", javascriptHint);
 
   function getCoffeeScriptToken(editor, cur) {
@@ -71,7 +85,6 @@
   function coffeescriptHint(editor, options) {
     return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken, options);
   }
-  CodeMirror.coffeescriptHint = coffeescriptHint; // deprecated
   CodeMirror.registerHelper("hint", "coffeescript", coffeescriptHint);
 
   var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
@@ -85,7 +98,7 @@
                   "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
 
   function getCompletions(token, context, keywords, options) {
-    var found = [], start = token.string;
+    var found = [], start = token.string, global = options && options.globalScope || window;
     function maybeAdd(str) {
       if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
     }
@@ -103,29 +116,31 @@
       if (obj.type && obj.type.indexOf("variable") === 0) {
         if (options && options.additionalContext)
           base = options.additionalContext[obj.string];
-        base = base || window[obj.string];
+        if (!options || options.useGlobalScope !== false)
+          base = base || global[obj.string];
       } else if (obj.type == "string") {
         base = "";
       } else if (obj.type == "atom") {
         base = 1;
       } else if (obj.type == "function") {
-        if (window.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
-            (typeof window.jQuery == 'function'))
-          base = window.jQuery();
-        else if (window._ != null && (obj.string == '_') && (typeof window._ == 'function'))
-          base = window._();
+        if (global.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
+            (typeof global.jQuery == 'function'))
+          base = global.jQuery();
+        else if (global._ != null && (obj.string == '_') && (typeof global._ == 'function'))
+          base = global._();
       }
       while (base != null && context.length)
         base = base[context.pop().string];
       if (base != null) gatherCompletions(base);
     } else {
-      // If not, just look in the window object and any local scope
+      // If not, just look in the global object and any local scope
       // (reading into JS mode internals to get at the local and global variables)
       for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
       for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
-      gatherCompletions(window);
+      if (!options || options.useGlobalScope !== false)
+        gatherCompletions(global);
       forEach(keywords, maybeAdd);
     }
     return found;
   }
-})();
+});

applications/admin/static/codemirror/addon/hint/pig-hint.js

@@ -1,121 +0,0 @@
-(function () {
-  "use strict";
-
-  function forEach(arr, f) {
-    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
-  }
-
-  function arrayContains(arr, item) {
-    if (!Array.prototype.indexOf) {
-      var i = arr.length;
-      while (i--) {
-        if (arr[i] === item) {
-          return true;
-        }
-      }
-      return false;
-    }
-    return arr.indexOf(item) != -1;
-  }
-
-  function scriptHint(editor, _keywords, getToken) {
-    // Find the token at the cursor
-    var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
-    // If it's not a 'word-style' token, ignore the token.
-
-    if (!/^[\w$_]*$/.test(token.string)) {
-        token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-                         className: token.string == ":" ? "pig-type" : null};
-    }
-
-    if (!context) var context = [];
-    context.push(tprop);
-
-    var completionList = getCompletions(token, context);
-    completionList = completionList.sort();
-    //prevent autocomplete for last word, instead show dropdown with one word
-    if(completionList.length == 1) {
-      completionList.push(" ");
-    }
-
-    return {list: completionList,
-            from: CodeMirror.Pos(cur.line, token.start),
-            to: CodeMirror.Pos(cur.line, token.end)};
-  }
-
-  function pigHint(editor) {
-    return scriptHint(editor, pigKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
-  }
-  CodeMirror.pigHint = pigHint; // deprecated
-  CodeMirror.registerHelper("hint", "pig", pigHint);
-
-  var pigKeywords = "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";
-  var pigKeywordsU = pigKeywords.split(" ");
-  var pigKeywordsL = pigKeywords.toLowerCase().split(" ");
-
-  var pigTypes = "BOOLEAN INT LONG FLOAT DOUBLE CHARARRAY BYTEARRAY BAG TUPLE MAP";
-  var pigTypesU = pigTypes.split(" ");
-  var pigTypesL = pigTypes.toLowerCase().split(" ");
-
-  var pigBuiltins = "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";
-  var pigBuiltinsU = pigBuiltins.split(" ").join("() ").split(" ");
-  var pigBuiltinsL = pigBuiltins.toLowerCase().split(" ").join("() ").split(" ");
-  var pigBuiltinsC = ("BagSize BinStorage Bloom BuildBloom ConstantSize CubeDimensions DoubleAbs "
-  + "DoubleAvg DoubleBase DoubleMax DoubleMin DoubleRound DoubleSum FloatAbs FloatAvg FloatMax "
-  + "FloatMin FloatRound FloatSum GenericInvoker IntAbs IntAvg IntMax IntMin IntSum "
-  + "InvokeForDouble InvokeForFloat InvokeForInt InvokeForLong InvokeForString Invoker "
-  + "IsEmpty JsonLoader JsonMetadata JsonStorage LongAbs LongAvg LongMax LongMin LongSum MapSize "
-  + "MonitoredUDF Nondeterministic OutputSchema PigStorage PigStreaming StringConcat StringMax "
-  + "StringMin StringSize TextLoader TupleSize Utf8StorageConverter").split(" ").join("() ").split(" ");
-
-  function getCompletions(token, context) {
-    var found = [], start = token.string;
-    function maybeAdd(str) {
-      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
-    }
-
-    function gatherCompletions(obj) {
-      if(obj == ":") {
-        forEach(pigTypesL, maybeAdd);
-      }
-      else {
-        forEach(pigBuiltinsU, maybeAdd);
-        forEach(pigBuiltinsL, maybeAdd);
-        forEach(pigBuiltinsC, maybeAdd);
-        forEach(pigTypesU, maybeAdd);
-        forEach(pigTypesL, maybeAdd);
-        forEach(pigKeywordsU, maybeAdd);
-        forEach(pigKeywordsL, maybeAdd);
-      }
-    }
-
-    if (context) {
-      // If this is a property, see if it belongs to some object we can
-      // find in the current environment.
-      var obj = context.pop(), base;
-
-      if (obj.type == "variable")
-          base = obj.string;
-      else if(obj.type == "variable-3")
-          base = ":" + obj.string;
-
-      while (base != null && context.length)
-        base = base[context.pop().string];
-      if (base != null) gatherCompletions(base);
-    }
-    return found;
-  }
-})();

applications/admin/static/codemirror/addon/hint/python-hint.js

@@ -1,4 +1,13 @@
-(function () {
+(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 forEach(arr, f) {
     for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
   }
@@ -40,7 +49,6 @@
   function pythonHint(editor) {
     return scriptHint(editor, pythonKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
   }
-  CodeMirror.pythonHint = pythonHint; // deprecated
   CodeMirror.registerHelper("hint", "python", pythonHint);
 
   var pythonKeywords = "and del from not while as elif global or with assert else if pass yield"
@@ -88,4 +96,4 @@
     }
     return found;
   }
-})();
+});

applications/admin/static/codemirror/addon/hint/show-hint.css

@@ -32,7 +32,7 @@
   cursor: pointer;
 }
 
-.CodeMirror-hint-active {
+li.CodeMirror-hint-active {
   background: #08f;
   color: white;
 }

applications/admin/static/codemirror/addon/hint/show-hint.js

@@ -1,31 +1,57 @@
-(function() {
+// 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 HINT_ELEMENT_CLASS        = "CodeMirror-hint";
   var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
 
+  // This is the old interface, kept around for now to stay
+  // backwards-compatible.
   CodeMirror.showHint = function(cm, getHints, options) {
-    // We want a single cursor position.
-    if (cm.somethingSelected()) return;
-    if (getHints == null) {
-      if (options && options.async) return;
-      else getHints = CodeMirror.hint.auto;
-    }
-
-    if (cm.state.completionActive) cm.state.completionActive.close();
-
-    var completion = cm.state.completionActive = new Completion(cm, getHints, options || {});
-    CodeMirror.signal(cm, "startCompletion", cm);
-    if (completion.options.async)
-      getHints(cm, function(hints) { completion.showHints(hints); }, completion.options);
-    else
-      return completion.showHints(getHints(cm, completion.options));
+    if (!getHints) return cm.showHint(options);
+    if (options && options.async) getHints.async = true;
+    var newOpts = {hint: getHints};
+    if (options) for (var prop in options) newOpts[prop] = options[prop];
+    return cm.showHint(newOpts);
   };
 
-  function Completion(cm, getHints, options) {
+  var asyncRunID = 0;
+  function retrieveHints(getter, cm, options, then) {
+    if (getter.async) {
+      var id = ++asyncRunID;
+      getter(cm, function(hints) {
+        if (asyncRunID == id) then(hints);
+      }, options);
+    } else {
+      then(getter(cm, options));
+    }
+  }
+
+  CodeMirror.defineExtension("showHint", function(options) {
+    // We want a single cursor position.
+    if (this.listSelections().length > 1 || this.somethingSelected()) return;
+
+    if (this.state.completionActive) this.state.completionActive.close();
+    var completion = this.state.completionActive = new Completion(this, options);
+    var getHints = completion.options.hint;
+    if (!getHints) return;
+
+    CodeMirror.signal(this, "startCompletion", this);
+    return retrieveHints(getHints, this, completion.options, function(hints) { completion.showHints(hints); });
+  });
+
+  function Completion(cm, options) {
     this.cm = cm;
-    this.getHints = getHints;
-    this.options = options;
+    this.options = this.buildOptions(options);
     this.widget = this.onClose = null;
   }
 
@@ -46,7 +72,8 @@
     pick: function(data, i) {
       var completion = data.list[i];
       if (completion.hint) completion.hint(this.cm, data, completion);
-      else this.cm.replaceRange(getText(completion), data.from, data.to);
+      else this.cm.replaceRange(getText(completion), completion.from || data.from,
+                                completion.to || data.to, "complete");
       CodeMirror.signal(data, "pick", completion);
       this.close();
     },
@@ -54,7 +81,7 @@
     showHints: function(data) {
       if (!data || !data.list.length || !this.active()) return this.close();
 
-      if (this.options.completeSingle != false && data.list.length == 1)
+      if (this.options.completeSingle && data.list.length == 1)
         this.pick(data, 0);
       else
         this.showWidget(data);
@@ -65,7 +92,7 @@
       CodeMirror.signal(data, "shown");
 
       var debounce = 0, completion = this, finished;
-      var closeOn = this.options.closeCharacters || /[\s()\[\]{};:>,]/;
+      var closeOn = this.options.closeCharacters;
       var startPos = this.cm.getCursor(), startLen = this.cm.getLine(startPos.line).length;
 
       var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
@@ -84,15 +111,13 @@
       function update() {
         if (finished) return;
         CodeMirror.signal(data, "update");
-        if (completion.options.async)
-          completion.getHints(completion.cm, finishUpdate, completion.options);
-        else
-          finishUpdate(completion.getHints(completion.cm, completion.options));
+        retrieveHints(completion.options.hint, completion.cm, completion.options, finishUpdate);
       }
       function finishUpdate(data_) {
         data = data_;
         if (finished) return;
         if (!data || !data.list.length) return done();
+        if (completion.widget) completion.widget.close();
         completion.widget = new Widget(completion, data);
       }
 
@@ -117,6 +142,17 @@
       }
       this.cm.on("cursorActivity", activity);
       this.onClose = done;
+    },
+
+    buildOptions: function(options) {
+      var editor = this.cm.options.hintOptions;
+      var out = {};
+      for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
+      if (editor) for (var prop in editor)
+        if (editor[prop] !== undefined) out[prop] = editor[prop];
+      if (options) for (var prop in options)
+        if (options[prop] !== undefined) out[prop] = options[prop];
+      return out;
     }
   };
 
@@ -125,7 +161,7 @@
     else return completion.text;
   }
 
-  function buildKeyMap(options, handle) {
+  function buildKeyMap(completion, handle) {
     var baseMap = {
       Up: function() {handle.moveFocus(-1);},
       Down: function() {handle.moveFocus(1);},
@@ -137,7 +173,8 @@
       Tab: handle.pick,
       Esc: handle.close
     };
-    var ourMap = options.customKeys ? {} : baseMap;
+    var custom = completion.options.customKeys;
+    var ourMap = custom ? {} : baseMap;
     function addBinding(key, val) {
       var bound;
       if (typeof val != "string")
@@ -149,12 +186,13 @@
         bound = val;
       ourMap[key] = bound;
     }
-    if (options.customKeys)
-      for (var key in options.customKeys) if (options.customKeys.hasOwnProperty(key))
-        addBinding(key, options.customKeys[key]);
-    if (options.extraKeys)
-      for (var key in options.extraKeys) if (options.extraKeys.hasOwnProperty(key))
-        addBinding(key, options.extraKeys[key]);
+    if (custom)
+      for (var key in custom) if (custom.hasOwnProperty(key))
+        addBinding(key, custom[key]);
+    var extra = completion.options.extraKeys;
+    if (extra)
+      for (var key in extra) if (extra.hasOwnProperty(key))
+        addBinding(key, extra[key]);
     return ourMap;
   }
 
@@ -168,11 +206,11 @@
   function Widget(completion, data) {
     this.completion = completion;
     this.data = data;
-    var widget = this, cm = completion.cm, options = completion.options;
+    var widget = this, cm = completion.cm;
 
     var hints = this.hints = document.createElement("ul");
     hints.className = "CodeMirror-hints";
-    this.selectedHint = options.getDefaultSelection ? options.getDefaultSelection(cm,options,data) : 0;
+    this.selectedHint = data.selectedHint || 0;
 
     var completions = data.list;
     for (var i = 0; i < completions.length; ++i) {
@@ -185,16 +223,32 @@
       elt.hintId = i;
     }
 
-    var pos = cm.cursorCoords(options.alignWithWord !== false ? data.from : null);
+    var pos = cm.cursorCoords(completion.options.alignWithWord ? data.from : null);
     var left = pos.left, top = pos.bottom, below = true;
     hints.style.left = left + "px";
     hints.style.top = top + "px";
     // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
     var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
     var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
-    (options.container || document.body).appendChild(hints);
-    var box = hints.getBoundingClientRect();
-    var overlapX = box.right - winW, overlapY = box.bottom - winH;
+    (completion.options.container || document.body).appendChild(hints);
+    var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
+    if (overlapY > 0) {
+      var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
+      if (curTop - height > 0) { // Fits above cursor
+        hints.style.top = (top = pos.top - height) + "px";
+        below = false;
+      } else if (height > winH) {
+        hints.style.height = (winH - 5) + "px";
+        hints.style.top = (top = pos.bottom - box.top) + "px";
+        var cursor = cm.getCursor();
+        if (data.from.ch != cursor.ch) {
+          pos = cm.cursorCoords(cursor);
+          hints.style.left = (left = pos.left) + "px";
+          box = hints.getBoundingClientRect();
+        }
+      }
+    }
+    var overlapX = box.right - winW;
     if (overlapX > 0) {
       if (box.right - box.left > winW) {
         hints.style.width = (winW - 5) + "px";
@@ -202,28 +256,18 @@
       }
       hints.style.left = (left = pos.left - overlapX) + "px";
     }
-    if (overlapY > 0) {
-      var height = box.bottom - box.top;
-      if (box.top - (pos.bottom - pos.top) - height > 0) {
-        overlapY = height + (pos.bottom - pos.top);
-        below = false;
-      } else if (height > winH) {
-        hints.style.height = (winH - 5) + "px";
-        overlapY -= height - winH;
-      }
-      hints.style.top = (top = pos.bottom - overlapY) + "px";
-    }
 
-    cm.addKeyMap(this.keyMap = buildKeyMap(options, {
+    cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
       moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
       setFocus: function(n) { widget.changeActive(n); },
       menuSize: function() { return widget.screenAmount(); },
       length: completions.length,
       close: function() { completion.close(); },
-      pick: function() { widget.pick(); }
+      pick: function() { widget.pick(); },
+      data: data
     }));
 
-    if (options.closeOnUnfocus !== false) {
+    if (completion.options.closeOnUnfocus) {
       var closingOnBlur;
       cm.on("blur", this.onBlur = function() { closingOnBlur = setTimeout(function() { completion.close(); }, 100); });
       cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
@@ -249,7 +293,7 @@
       var t = getHintElement(hints, e.target || e.srcElement);
       if (t && t.hintId != null) {
         widget.changeActive(t.hintId);
-        if (options.completeOnSingleClick) widget.pick();
+        if (completion.options.completeOnSingleClick) widget.pick();
       }
     });
 
@@ -269,7 +313,7 @@
       this.completion.cm.removeKeyMap(this.keyMap);
 
       var cm = this.completion.cm;
-      if (this.completion.options.closeOnUnfocus !== false) {
+      if (this.completion.options.closeOnUnfocus) {
         cm.off("blur", this.onBlur);
         cm.off("focus", this.onFocus);
       }
@@ -303,15 +347,16 @@
   };
 
   CodeMirror.registerHelper("hint", "auto", function(cm, options) {
-    var helpers = cm.getHelpers(cm.getCursor(), "hint");
+    var helpers = cm.getHelpers(cm.getCursor(), "hint"), words;
     if (helpers.length) {
       for (var i = 0; i < helpers.length; i++) {
         var cur = helpers[i](cm, options);
         if (cur && cur.list.length) return cur;
       }
-    } else {
-      var words = cm.getHelper(cm.getCursor(), "hintWords");
+    } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
       if (words) return CodeMirror.hint.fromList(cm, {words: words});
+    } else if (CodeMirror.hint.anyword) {
+      return CodeMirror.hint.anyword(cm, options);
     }
   });
 
@@ -332,4 +377,18 @@
   });
 
   CodeMirror.commands.autocomplete = CodeMirror.showHint;
-})();
+
+  var defaultOptions = {
+    hint: CodeMirror.hint.auto,
+    completeSingle: true,
+    alignWithWord: true,
+    closeCharacters: /[\s()\[\]{};:>,]/,
+    closeOnUnfocus: true,
+    completeOnSingleClick: false,
+    container: null,
+    customKeys: null,
+    extraKeys: null
+  };
+
+  CodeMirror.defineOption("hintOptions", null);
+});

applications/admin/static/codemirror/addon/hint/sql-hint.js

@@ -0,0 +1,240 @@
+// 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("../../mode/sql/sql"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../mode/sql/sql"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var tables;
+  var defaultTable;
+  var keywords;
+  var CONS = {
+    QUERY_DIV: ";",
+    ALIAS_KEYWORD: "AS"
+  };
+  var Pos = CodeMirror.Pos;
+
+  function getKeywords(editor) {
+    var mode = editor.doc.modeOption;
+    if (mode === "sql") mode = "text/x-sql";
+    return CodeMirror.resolveMode(mode).keywords;
+  }
+
+  function getText(item) {
+    return typeof item == "string" ? item : item.text;
+  }
+
+  function getItem(list, item) {
+    if (!list.slice) return list[item];
+    for (var i = list.length - 1; i >= 0; i--) if (getText(list[i]) == item)
+      return list[i];
+  }
+
+  function shallowClone(object) {
+    var result = {};
+    for (var key in object) if (object.hasOwnProperty(key))
+      result[key] = object[key];
+    return result;
+  }
+
+  function match(string, word) {
+    var len = string.length;
+    var sub = getText(word).substr(0, len);
+    return string.toUpperCase() === sub.toUpperCase();
+  }
+
+  function addMatches(result, search, wordlist, formatter) {
+    for (var word in wordlist) {
+      if (!wordlist.hasOwnProperty(word)) continue;
+      if (Array.isArray(wordlist)) {
+        word = wordlist[word];
+      }
+      if (match(search, word)) {
+        result.push(formatter(word));
+      }
+    }
+  }
+
+  function cleanName(name) {
+    // Get rid name from backticks(`) and preceding dot(.)
+    if (name.charAt(0) == ".") {
+      name = name.substr(1);
+    }
+    return name.replace(/`/g, "");
+  }
+
+  function insertBackticks(name) {
+    var nameParts = getText(name).split(".");
+    for (var i = 0; i < nameParts.length; i++)
+      nameParts[i] = "`" + nameParts[i] + "`";
+    var escaped = nameParts.join(".");
+    if (typeof name == "string") return escaped;
+    name = shallowClone(name);
+    name.text = escaped;
+    return name;
+  }
+
+  function nameCompletion(cur, token, result, editor) {
+    // Try to complete table, colunm names and return start position of completion
+    var useBacktick = false;
+    var nameParts = [];
+    var start = token.start;
+    var cont = true;
+    while (cont) {
+      cont = (token.string.charAt(0) == ".");
+      useBacktick = useBacktick || (token.string.charAt(0) == "`");
+
+      start = token.start;
+      nameParts.unshift(cleanName(token.string));
+
+      token = editor.getTokenAt(Pos(cur.line, token.start));
+      if (token.string == ".") {
+        cont = true;
+        token = editor.getTokenAt(Pos(cur.line, token.start));
+      }
+    }
+
+    // Try to complete table names
+    var string = nameParts.join(".");
+    addMatches(result, string, tables, function(w) {
+      return useBacktick ? insertBackticks(w) : w;
+    });
+
+    // Try to complete columns from defaultTable
+    addMatches(result, string, defaultTable, function(w) {
+      return useBacktick ? insertBackticks(w) : w;
+    });
+
+    // Try to complete columns
+    string = nameParts.pop();
+    var table = nameParts.join(".");
+
+    // Check if table is available. If not, find table by Alias
+    if (!getItem(tables, table))
+      table = findTableByAlias(table, editor);
+
+    var columns = getItem(tables, table);
+    if (columns && Array.isArray(tables) && columns.columns)
+      columns = columns.columns;
+
+    if (columns) {
+      addMatches(result, string, columns, function(w) {
+        if (typeof w == "string") {
+          w = table + "." + w;
+        } else {
+          w = shallowClone(w);
+          w.text = table + "." + w.text;
+        }
+        return useBacktick ? insertBackticks(w) : w;
+      });
+    }
+
+    return start;
+  }
+
+  function eachWord(lineText, f) {
+    if (!lineText) return;
+    var excepted = /[,;]/g;
+    var words = lineText.split(" ");
+    for (var i = 0; i < words.length; i++) {
+      f(words[i]?words[i].replace(excepted, '') : '');
+    }
+  }
+
+  function convertCurToNumber(cur) {
+    // max characters of a line is 999,999.
+    return cur.line + cur.ch / Math.pow(10, 6);
+  }
+
+  function convertNumberToCur(num) {
+    return Pos(Math.floor(num), +num.toString().split('.').pop());
+  }
+
+  function findTableByAlias(alias, editor) {
+    var doc = editor.doc;
+    var fullQuery = doc.getValue();
+    var aliasUpperCase = alias.toUpperCase();
+    var previousWord = "";
+    var table = "";
+    var separator = [];
+    var validRange = {
+      start: Pos(0, 0),
+      end: Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).length)
+    };
+
+    //add separator
+    var indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV);
+    while(indexOfSeparator != -1) {
+      separator.push(doc.posFromIndex(indexOfSeparator));
+      indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV, indexOfSeparator+1);
+    }
+    separator.unshift(Pos(0, 0));
+    separator.push(Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).text.length));
+
+    //find valid range
+    var prevItem = 0;
+    var current = convertCurToNumber(editor.getCursor());
+    for (var i=0; i< separator.length; i++) {
+      var _v = convertCurToNumber(separator[i]);
+      if (current > prevItem && current <= _v) {
+        validRange = { start: convertNumberToCur(prevItem), end: convertNumberToCur(_v) };
+        break;
+      }
+      prevItem = _v;
+    }
+
+    var query = doc.getRange(validRange.start, validRange.end, false);
+
+    for (var i = 0; i < query.length; i++) {
+      var lineText = query[i];
+      eachWord(lineText, function(word) {
+        var wordUpperCase = word.toUpperCase();
+        if (wordUpperCase === aliasUpperCase && getItem(tables, previousWord))
+          table = previousWord;
+        if (wordUpperCase !== CONS.ALIAS_KEYWORD)
+          previousWord = word;
+      });
+      if (table) break;
+    }
+    return table;
+  }
+
+  CodeMirror.registerHelper("hint", "sql", function(editor, options) {
+    tables = (options && options.tables) || {};
+    var defaultTableName = options && options.defaultTable;
+    defaultTable = (defaultTableName && getItem(tables, defaultTableName)) || [];
+    keywords = keywords || getKeywords(editor);
+
+    var cur = editor.getCursor();
+    var result = [];
+    var token = editor.getTokenAt(cur), start, end, search;
+    if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
+    }
+
+    if (token.string.match(/^[.`\w@]\w*$/)) {
+      search = token.string;
+      start = token.start;
+      end = token.end;
+    } else {
+      start = end = cur.ch;
+      search = "";
+    }
+    if (search.charAt(0) == "." || search.charAt(0) == "`") {
+      start = nameCompletion(cur, token, result, editor);
+    } else {
+      addMatches(result, search, tables, function(w) {return w;});
+      addMatches(result, search, defaultTable, function(w) {return w;});
+      addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
+    }
+
+    return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
+  });
+});

applications/admin/static/codemirror/addon/hint/xml-hint.js

@@ -1,4 +1,14 @@
-(function() {
+// 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 Pos = CodeMirror.Pos;
@@ -8,30 +18,55 @@
     var quote = (options && options.quoteChar) || '"';
     if (!tags) return;
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
+    }
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
     if (inner.mode.name != "xml") return;
     var result = [], replaceToken = false, prefix;
-    var isTag = token.string.charAt(0) == "<";
-    if (!inner.state.tagName || isTag) { // Tag completion
-      if (isTag) {
-        prefix = token.string.slice(1);
-        replaceToken = true;
-      }
+    var tag = /\btag\b/.test(token.type) && !/>$/.test(token.string);
+    var tagName = tag && /^\w/.test(token.string), tagStart;
+
+    if (tagName) {
+      var before = cm.getLine(cur.line).slice(Math.max(0, token.start - 2), token.start);
+      var tagType = /<\/$/.test(before) ? "close" : /<$/.test(before) ? "open" : null;
+      if (tagType) tagStart = token.start - (tagType == "close" ? 2 : 1);
+    } else if (tag && token.string == "<") {
+      tagType = "open";
+    } else if (tag && token.string == "</") {
+      tagType = "close";
+    }
+
+    if (!tag && !inner.state.tagName || tagType) {
+      if (tagName)
+        prefix = token.string;
+      replaceToken = tagType;
       var cx = inner.state.context, curTag = cx && tags[cx.tagName];
       var childList = cx ? curTag && curTag.children : tags["!top"];
-      if (childList) {
+      if (childList && tagType != "close") {
         for (var i = 0; i < childList.length; ++i) if (!prefix || childList[i].lastIndexOf(prefix, 0) == 0)
           result.push("<" + childList[i]);
-      } else {
-        for (var name in tags) if (tags.hasOwnProperty(name) && name != "!top" && (!prefix || name.lastIndexOf(prefix, 0) == 0))
-          result.push("<" + name);
+      } else if (tagType != "close") {
+        for (var name in tags)
+          if (tags.hasOwnProperty(name) && name != "!top" && name != "!attrs" && (!prefix || name.lastIndexOf(prefix, 0) == 0))
+            result.push("<" + name);
       }
-      if (cx && (!prefix || ("/" + cx.tagName).lastIndexOf(prefix, 0) == 0))
+      if (cx && (!prefix || tagType == "close" && cx.tagName.lastIndexOf(prefix, 0) == 0))
         result.push("</" + cx.tagName + ">");
     } else {
       // Attribute completion
       var curTag = tags[inner.state.tagName], attrs = curTag && curTag.attrs;
-      if (!attrs) return;
+      var globalAttrs = tags["!attrs"];
+      if (!attrs && !globalAttrs) return;
+      if (!attrs) {
+        attrs = globalAttrs;
+      } else if (globalAttrs) { // Combine tag-local and global attributes
+        var set = {};
+        for (var nm in globalAttrs) if (globalAttrs.hasOwnProperty(nm)) set[nm] = globalAttrs[nm];
+        for (var nm in attrs) if (attrs.hasOwnProperty(nm)) set[nm] = attrs[nm];
+        attrs = set;
+      }
       if (token.type == "string" || token.string == "=") { // A value
         var before = cm.getRange(Pos(cur.line, Math.max(0, cur.ch - 60)),
                                  Pos(cur.line, token.type == "string" ? token.start : token.end));
@@ -40,9 +75,16 @@
         if (typeof atValues == 'function') atValues = atValues.call(this, cm); // Functions can be used to supply values for autocomplete widget
         if (token.type == "string") {
           prefix = token.string;
+          var n = 0;
           if (/['"]/.test(token.string.charAt(0))) {
             quote = token.string.charAt(0);
             prefix = token.string.slice(1);
+            n++;
+          }
+          var len = token.string.length;
+          if (/['"]/.test(token.string.charAt(len - 1))) {
+            quote = token.string.charAt(len - 1);
+            prefix = token.string.substr(n, len - 2);
           }
           replaceToken = true;
         }
@@ -59,11 +101,10 @@
     }
     return {
       list: result,
-      from: replaceToken ? Pos(cur.line, token.start) : cur,
+      from: replaceToken ? Pos(cur.line, tagStart == null ? token.start : tagStart) : cur,
       to: replaceToken ? Pos(cur.line, token.end) : cur
     };
   }
 
-  CodeMirror.xmlHint = getHints; // deprecated
   CodeMirror.registerHelper("hint", "xml", getHints);
-})();
+});

applications/admin/static/codemirror/addon/lint/coffeescript-lint.js

@@ -1,27 +0,0 @@
-// Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
-
-// declare global: coffeelint
-
-CodeMirror.registerHelper("lint", "coffeescript", function(text) {
-  var found = [];
-  var parseError = function(err) {
-    var loc = err.lineNumber;
-    found.push({from: CodeMirror.Pos(loc-1, 0),
-                to: CodeMirror.Pos(loc, 0),
-                severity: err.level,
-                message: err.message});
-  };
-  try {
-    var res = coffeelint.lint(text);
-    for(var i = 0; i < res.length; i++) {
-      parseError(res[i]);
-    }
-  } catch(e) {
-    found.push({from: CodeMirror.Pos(e.location.first_line, 0),
-                to: CodeMirror.Pos(e.location.last_line, e.location.last_column),
-                severity: 'error',
-                message: e.message});
-  }
-  return found;
-});
-CodeMirror.coffeeValidator = CodeMirror.lint.coffeescript; // deprecated

applications/admin/static/codemirror/addon/lint/javascript-lint.js

@@ -1,126 +0,0 @@
-(function() {
-  "use strict";
-  // declare global: JSHINT
-
-  var bogus = [ "Dangerous comment" ];
-
-  var warnings = [ [ "Expected '{'",
-                     "Statement body should be inside '{ }' braces." ] ];
-
-  var errors = [ "Missing semicolon", "Extra comma", "Missing property name",
-                 "Unmatched ", " and instead saw", " is not defined",
-                 "Unclosed string", "Stopping, unable to continue" ];
-
-  function validator(text, options) {
-    JSHINT(text, options);
-    var errors = JSHINT.data().errors, result = [];
-    if (errors) parseErrors(errors, result);
-    return result;
-  }
-
-  CodeMirror.registerHelper("lint", "javascript", validator);
-  CodeMirror.javascriptValidator = CodeMirror.lint.javascript; // deprecated
-
-  function cleanup(error) {
-    // All problems are warnings by default
-    fixWith(error, warnings, "warning", true);
-    fixWith(error, errors, "error");
-
-    return isBogus(error) ? null : error;
-  }
-
-  function fixWith(error, fixes, severity, force) {
-    var description, fix, find, replace, found;
-
-    description = error.description;
-
-    for ( var i = 0; i < fixes.length; i++) {
-      fix = fixes[i];
-      find = (typeof fix === "string" ? fix : fix[0]);
-      replace = (typeof fix === "string" ? null : fix[1]);
-      found = description.indexOf(find) !== -1;
-
-      if (force || found) {
-        error.severity = severity;
-      }
-      if (found && replace) {
-        error.description = replace;
-      }
-    }
-  }
-
-  function isBogus(error) {
-    var description = error.description;
-    for ( var i = 0; i < bogus.length; i++) {
-      if (description.indexOf(bogus[i]) !== -1) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  function parseErrors(errors, output) {
-    for ( var i = 0; i < errors.length; i++) {
-      var error = errors[i];
-      if (error) {
-        var linetabpositions, index;
-
-        linetabpositions = [];
-
-        // This next block is to fix a problem in jshint. Jshint
-        // replaces
-        // all tabs with spaces then performs some checks. The error
-        // positions (character/space) are then reported incorrectly,
-        // not taking the replacement step into account. Here we look
-        // at the evidence line and try to adjust the character position
-        // to the correct value.
-        if (error.evidence) {
-          // Tab positions are computed once per line and cached
-          var tabpositions = linetabpositions[error.line];
-          if (!tabpositions) {
-            var evidence = error.evidence;
-            tabpositions = [];
-            // ugggh phantomjs does not like this
-            // forEachChar(evidence, function(item, index) {
-            Array.prototype.forEach.call(evidence, function(item,
-                                                            index) {
-              if (item === '\t') {
-                // First col is 1 (not 0) to match error
-                // positions
-                tabpositions.push(index + 1);
-              }
-            });
-            linetabpositions[error.line] = tabpositions;
-          }
-          if (tabpositions.length > 0) {
-            var pos = error.character;
-            tabpositions.forEach(function(tabposition) {
-              if (pos > tabposition) pos -= 1;
-            });
-            error.character = pos;
-          }
-        }
-
-        var start = error.character - 1, end = start + 1;
-        if (error.evidence) {
-          index = error.evidence.substring(start).search(/.\b/);
-          if (index > -1) {
-            end += index;
-          }
-        }
-
-        // Convert to format expected by validation service
-        error.description = error.reason;// + "(jshint)";
-        error.start = error.character;
-        error.end = end;
-        error = cleanup(error);
-
-        if (error)
-          output.push({message: error.description,
-                       severity: error.severity,
-                       from: CodeMirror.Pos(error.line - 1, start),
-                       to: CodeMirror.Pos(error.line - 1, end)});
-      }
-    }
-  }
-})();

applications/admin/static/codemirror/addon/lint/json-lint.js

@@ -1,17 +0,0 @@
-// Depends on jsonlint.js from https://github.com/zaach/jsonlint
-
-// declare global: jsonlint
-
-CodeMirror.registerHelper("lint", "json", function(text) {
-  var found = [];
-  jsonlint.parseError = function(str, hash) {
-    var loc = hash.loc;
-    found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),
-                to: CodeMirror.Pos(loc.last_line - 1, loc.last_column),
-                message: str});
-  };
-  try { jsonlint.parse(text); }
-  catch(e) {}
-  return found;
-});
-CodeMirror.jsonValidator = CodeMirror.lint.json; // deprecated

applications/admin/static/codemirror/addon/lint/lint.css

@@ -1,73 +0,0 @@
-/* The lint marker gutter */
-.CodeMirror-lint-markers {
-  width: 16px;
-}
-
-.CodeMirror-lint-tooltip {
-  background-color: infobackground;
-  border: 1px solid black;
-  border-radius: 4px 4px 4px 4px;
-  color: infotext;
-  font-family: monospace;
-  font-size: 10pt;
-  overflow: hidden;
-  padding: 2px 5px;
-  position: fixed;
-  white-space: pre;
-  white-space: pre-wrap;
-  z-index: 100;
-  max-width: 600px;
-  opacity: 0;
-  transition: opacity .4s;
-  -moz-transition: opacity .4s;
-  -webkit-transition: opacity .4s;
-  -o-transition: opacity .4s;
-  -ms-transition: opacity .4s;
-}
-
-.CodeMirror-lint-mark-error, .CodeMirror-lint-mark-warning {
-  background-position: left bottom;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-lint-mark-error {
-  background-image:
-  url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==")
-  ;
-}
-
-.CodeMirror-lint-mark-warning {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning {
-  background-position: center center;
-  background-repeat: no-repeat;
-  cursor: pointer;
-  display: inline-block;
-  height: 16px;
-  width: 16px;
-  vertical-align: middle;
-  position: relative;
-}
-
-.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {
-  padding-left: 18px;
-  background-position: top left;
-  background-repeat: no-repeat;
-}
-
-.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-multiple {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
-  background-repeat: no-repeat;
-  background-position: right bottom;
-  width: 100%; height: 100%;
-}

applications/admin/static/codemirror/addon/lint/lint.js

@@ -1,203 +0,0 @@
-(function() {
-  "use strict";
-  var GUTTER_ID = "CodeMirror-lint-markers";
-  var SEVERITIES = /^(?:error|warning)$/;
-
-  function showTooltip(e, content) {
-    var tt = document.createElement("div");
-    tt.className = "CodeMirror-lint-tooltip";
-    tt.appendChild(content.cloneNode(true));
-    document.body.appendChild(tt);
-
-    function position(e) {
-      if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);
-      tt.style.top = Math.max(0, e.clientY - tt.offsetHeight - 5) + "px";
-      tt.style.left = (e.clientX + 5) + "px";
-    }
-    CodeMirror.on(document, "mousemove", position);
-    position(e);
-    if (tt.style.opacity != null) tt.style.opacity = 1;
-    return tt;
-  }
-  function rm(elt) {
-    if (elt.parentNode) elt.parentNode.removeChild(elt);
-  }
-  function hideTooltip(tt) {
-    if (!tt.parentNode) return;
-    if (tt.style.opacity == null) rm(tt);
-    tt.style.opacity = 0;
-    setTimeout(function() { rm(tt); }, 600);
-  }
-
-  function showTooltipFor(e, content, node) {
-    var tooltip = showTooltip(e, content);
-    function hide() {
-      CodeMirror.off(node, "mouseout", hide);
-      if (tooltip) { hideTooltip(tooltip); tooltip = null; }
-    }
-    var poll = setInterval(function() {
-      if (tooltip) for (var n = node;; n = n.parentNode) {
-        if (n == document.body) return;
-        if (!n) { hide(); break; }
-      }
-      if (!tooltip) return clearInterval(poll);
-    }, 400);
-    CodeMirror.on(node, "mouseout", hide);
-  }
-
-  function LintState(cm, options, hasGutter) {
-    this.marked = [];
-    this.options = options;
-    this.timeout = null;
-    this.hasGutter = hasGutter;
-    this.onMouseOver = function(e) { onMouseOver(cm, e); };
-  }
-
-  function parseOptions(cm, options) {
-    if (options instanceof Function) return {getAnnotations: options};
-    if (!options || options === true) options = {};
-    if (!options.getAnnotations) options.getAnnotations = cm.getHelper(CodeMirror.Pos(0, 0), "lint");
-    if (!options.getAnnotations) throw new Error("Required option 'getAnnotations' missing (lint addon)");
-    return options;
-  }
-
-  function clearMarks(cm) {
-    var state = cm.state.lint;
-    if (state.hasGutter) cm.clearGutter(GUTTER_ID);
-    for (var i = 0; i < state.marked.length; ++i)
-      state.marked[i].clear();
-    state.marked.length = 0;
-  }
-
-  function makeMarker(labels, severity, multiple, tooltips) {
-    var marker = document.createElement("div"), inner = marker;
-    marker.className = "CodeMirror-lint-marker-" + severity;
-    if (multiple) {
-      inner = marker.appendChild(document.createElement("div"));
-      inner.className = "CodeMirror-lint-marker-multiple";
-    }
-
-    if (tooltips != false) CodeMirror.on(inner, "mouseover", function(e) {
-      showTooltipFor(e, labels, inner);
-    });
-
-    return marker;
-  }
-
-  function getMaxSeverity(a, b) {
-    if (a == "error") return a;
-    else return b;
-  }
-
-  function groupByLine(annotations) {
-    var lines = [];
-    for (var i = 0; i < annotations.length; ++i) {
-      var ann = annotations[i], line = ann.from.line;
-      (lines[line] || (lines[line] = [])).push(ann);
-    }
-    return lines;
-  }
-
-  function annotationTooltip(ann) {
-    var severity = ann.severity;
-    if (!SEVERITIES.test(severity)) severity = "error";
-    var tip = document.createElement("div");
-    tip.className = "CodeMirror-lint-message-" + severity;
-    tip.appendChild(document.createTextNode(ann.message));
-    return tip;
-  }
-
-  function startLinting(cm) {
-    var state = cm.state.lint, options = state.options;
-    if (options.async)
-      options.getAnnotations(cm, updateLinting, options);
-    else
-      updateLinting(cm, options.getAnnotations(cm.getValue(), options.options));
-  }
-
-  function updateLinting(cm, annotationsNotSorted) {
-    clearMarks(cm);
-    var state = cm.state.lint, options = state.options;
-
-    var annotations = groupByLine(annotationsNotSorted);
-
-    for (var line = 0; line < annotations.length; ++line) {
-      var anns = annotations[line];
-      if (!anns) continue;
-
-      var maxSeverity = null;
-      var tipLabel = state.hasGutter && document.createDocumentFragment();
-
-      for (var i = 0; i < anns.length; ++i) {
-        var ann = anns[i];
-        var severity = ann.severity;
-        if (!SEVERITIES.test(severity)) severity = "error";
-        maxSeverity = getMaxSeverity(maxSeverity, severity);
-
-        if (options.formatAnnotation) ann = options.formatAnnotation(ann);
-        if (state.hasGutter) tipLabel.appendChild(annotationTooltip(ann));
-
-        if (ann.to) state.marked.push(cm.markText(ann.from, ann.to, {
-          className: "CodeMirror-lint-mark-" + severity,
-          __annotation: ann
-        }));
-      }
-
-      if (state.hasGutter)
-        cm.setGutterMarker(line, GUTTER_ID, makeMarker(tipLabel, maxSeverity, anns.length > 1,
-                                                       state.options.tooltips));
-    }
-    if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
-  }
-
-  function onChange(cm) {
-    var state = cm.state.lint;
-    clearTimeout(state.timeout);
-    state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
-  }
-
-  function popupSpanTooltip(ann, e) {
-    var target = e.target || e.srcElement;
-    showTooltipFor(e, annotationTooltip(ann), target);
-  }
-
-  // When the mouseover fires, the cursor might not actually be over
-  // the character itself yet. These pairs of x,y offsets are used to
-  // probe a few nearby points when no suitable marked range is found.
-  var nearby = [0, 0, 0, 5, 0, -5, 5, 0, -5, 0];
-
-  function onMouseOver(cm, e) {
-    if (!/\bCodeMirror-lint-mark-/.test((e.target || e.srcElement).className)) return;
-    for (var i = 0; i < nearby.length; i += 2) {
-      var spans = cm.findMarksAt(cm.coordsChar({left: e.clientX + nearby[i],
-                                                top: e.clientY + nearby[i + 1]}));
-      for (var j = 0; j < spans.length; ++j) {
-        var span = spans[j], ann = span.__annotation;
-        if (ann) return popupSpanTooltip(ann, e);
-      }
-    }
-  }
-
-  function optionHandler(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      clearMarks(cm);
-      cm.off("change", onChange);
-      CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
-      delete cm.state.lint;
-    }
-
-    if (val) {
-      var gutters = cm.getOption("gutters"), hasLintGutter = false;
-      for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
-      var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
-      cm.on("change", onChange);
-      if (state.options.tooltips != false)
-        CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
-
-      startLinting(cm);
-    }
-  }
-
-  CodeMirror.defineOption("lintWith", false, optionHandler); // deprecated
-  CodeMirror.defineOption("lint", false, optionHandler); // deprecated
-})();

applications/admin/static/codemirror/addon/merge/dep/diff_match_patch.js

@@ -1,50 +0,0 @@
-// From https://code.google.com/p/google-diff-match-patch/ , licensed under the Apache License 2.0
-(function(){function diff_match_patch(){this.Diff_Timeout=1;this.Diff_EditCost=4;this.Match_Threshold=0.5;this.Match_Distance=1E3;this.Patch_DeleteThreshold=0.5;this.Patch_Margin=4;this.Match_MaxBits=32}
-diff_match_patch.prototype.diff_main=function(a,b,c,d){"undefined"==typeof d&&(d=0>=this.Diff_Timeout?Number.MAX_VALUE:(new Date).getTime()+1E3*this.Diff_Timeout);if(null==a||null==b)throw Error("Null input. (diff_main)");if(a==b)return a?[[0,a]]:[];"undefined"==typeof c&&(c=!0);var e=c,f=this.diff_commonPrefix(a,b);c=a.substring(0,f);a=a.substring(f);b=b.substring(f);var f=this.diff_commonSuffix(a,b),g=a.substring(a.length-f);a=a.substring(0,a.length-f);b=b.substring(0,b.length-f);a=this.diff_compute_(a,
-b,e,d);c&&a.unshift([0,c]);g&&a.push([0,g]);this.diff_cleanupMerge(a);return a};
-diff_match_patch.prototype.diff_compute_=function(a,b,c,d){if(!a)return[[1,b]];if(!b)return[[-1,a]];var e=a.length>b.length?a:b,f=a.length>b.length?b:a,g=e.indexOf(f);return-1!=g?(c=[[1,e.substring(0,g)],[0,f],[1,e.substring(g+f.length)]],a.length>b.length&&(c[0][0]=c[2][0]=-1),c):1==f.length?[[-1,a],[1,b]]:(e=this.diff_halfMatch_(a,b))?(f=e[0],a=e[1],g=e[2],b=e[3],e=e[4],f=this.diff_main(f,g,c,d),c=this.diff_main(a,b,c,d),f.concat([[0,e]],c)):c&&100<a.length&&100<b.length?this.diff_lineMode_(a,b,
-d):this.diff_bisect_(a,b,d)};
-diff_match_patch.prototype.diff_lineMode_=function(a,b,c){var d=this.diff_linesToChars_(a,b);a=d.chars1;b=d.chars2;d=d.lineArray;a=this.diff_main(a,b,!1,c);this.diff_charsToLines_(a,d);this.diff_cleanupSemantic(a);a.push([0,""]);for(var e=d=b=0,f="",g="";b<a.length;){switch(a[b][0]){case 1:e++;g+=a[b][1];break;case -1:d++;f+=a[b][1];break;case 0:if(1<=d&&1<=e){a.splice(b-d-e,d+e);b=b-d-e;d=this.diff_main(f,g,!1,c);for(e=d.length-1;0<=e;e--)a.splice(b,0,d[e]);b+=d.length}d=e=0;g=f=""}b++}a.pop();return a};
-diff_match_patch.prototype.diff_bisect_=function(a,b,c){for(var d=a.length,e=b.length,f=Math.ceil((d+e)/2),g=f,h=2*f,j=Array(h),i=Array(h),k=0;k<h;k++)j[k]=-1,i[k]=-1;j[g+1]=0;i[g+1]=0;for(var k=d-e,q=0!=k%2,r=0,t=0,p=0,w=0,v=0;v<f&&!((new Date).getTime()>c);v++){for(var n=-v+r;n<=v-t;n+=2){var l=g+n,m;m=n==-v||n!=v&&j[l-1]<j[l+1]?j[l+1]:j[l-1]+1;for(var s=m-n;m<d&&s<e&&a.charAt(m)==b.charAt(s);)m++,s++;j[l]=m;if(m>d)t+=2;else if(s>e)r+=2;else if(q&&(l=g+k-n,0<=l&&l<h&&-1!=i[l])){var u=d-i[l];if(m>=
-u)return this.diff_bisectSplit_(a,b,m,s,c)}}for(n=-v+p;n<=v-w;n+=2){l=g+n;u=n==-v||n!=v&&i[l-1]<i[l+1]?i[l+1]:i[l-1]+1;for(m=u-n;u<d&&m<e&&a.charAt(d-u-1)==b.charAt(e-m-1);)u++,m++;i[l]=u;if(u>d)w+=2;else if(m>e)p+=2;else if(!q&&(l=g+k-n,0<=l&&(l<h&&-1!=j[l])&&(m=j[l],s=g+m-l,u=d-u,m>=u)))return this.diff_bisectSplit_(a,b,m,s,c)}}return[[-1,a],[1,b]]};
-diff_match_patch.prototype.diff_bisectSplit_=function(a,b,c,d,e){var f=a.substring(0,c),g=b.substring(0,d);a=a.substring(c);b=b.substring(d);f=this.diff_main(f,g,!1,e);e=this.diff_main(a,b,!1,e);return f.concat(e)};
-diff_match_patch.prototype.diff_linesToChars_=function(a,b){function c(a){for(var b="",c=0,f=-1,g=d.length;f<a.length-1;){f=a.indexOf("\n",c);-1==f&&(f=a.length-1);var r=a.substring(c,f+1),c=f+1;(e.hasOwnProperty?e.hasOwnProperty(r):void 0!==e[r])?b+=String.fromCharCode(e[r]):(b+=String.fromCharCode(g),e[r]=g,d[g++]=r)}return b}var d=[],e={};d[0]="";var f=c(a),g=c(b);return{chars1:f,chars2:g,lineArray:d}};
-diff_match_patch.prototype.diff_charsToLines_=function(a,b){for(var c=0;c<a.length;c++){for(var d=a[c][1],e=[],f=0;f<d.length;f++)e[f]=b[d.charCodeAt(f)];a[c][1]=e.join("")}};diff_match_patch.prototype.diff_commonPrefix=function(a,b){if(!a||!b||a.charAt(0)!=b.charAt(0))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(f,e)==b.substring(f,e)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
-diff_match_patch.prototype.diff_commonSuffix=function(a,b){if(!a||!b||a.charAt(a.length-1)!=b.charAt(b.length-1))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(a.length-e,a.length-f)==b.substring(b.length-e,b.length-f)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
-diff_match_patch.prototype.diff_commonOverlap_=function(a,b){var c=a.length,d=b.length;if(0==c||0==d)return 0;c>d?a=a.substring(c-d):c<d&&(b=b.substring(0,c));c=Math.min(c,d);if(a==b)return c;for(var d=0,e=1;;){var f=a.substring(c-e),f=b.indexOf(f);if(-1==f)return d;e+=f;if(0==f||a.substring(c-e)==b.substring(0,e))d=e,e++}};
-diff_match_patch.prototype.diff_halfMatch_=function(a,b){function c(a,b,c){for(var d=a.substring(c,c+Math.floor(a.length/4)),e=-1,g="",h,j,n,l;-1!=(e=b.indexOf(d,e+1));){var m=f.diff_commonPrefix(a.substring(c),b.substring(e)),s=f.diff_commonSuffix(a.substring(0,c),b.substring(0,e));g.length<s+m&&(g=b.substring(e-s,e)+b.substring(e,e+m),h=a.substring(0,c-s),j=a.substring(c+m),n=b.substring(0,e-s),l=b.substring(e+m))}return 2*g.length>=a.length?[h,j,n,l,g]:null}if(0>=this.Diff_Timeout)return null;
-var d=a.length>b.length?a:b,e=a.length>b.length?b:a;if(4>d.length||2*e.length<d.length)return null;var f=this,g=c(d,e,Math.ceil(d.length/4)),d=c(d,e,Math.ceil(d.length/2)),h;if(!g&&!d)return null;h=d?g?g[4].length>d[4].length?g:d:d:g;var j;a.length>b.length?(g=h[0],d=h[1],e=h[2],j=h[3]):(e=h[0],j=h[1],g=h[2],d=h[3]);h=h[4];return[g,d,e,j,h]};
-diff_match_patch.prototype.diff_cleanupSemantic=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=0,h=0,j=0,i=0;f<a.length;)0==a[f][0]?(c[d++]=f,g=j,h=i,i=j=0,e=a[f][1]):(1==a[f][0]?j+=a[f][1].length:i+=a[f][1].length,e&&(e.length<=Math.max(g,h)&&e.length<=Math.max(j,i))&&(a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,d--,f=0<d?c[d-1]:-1,i=j=h=g=0,e=null,b=!0)),f++;b&&this.diff_cleanupMerge(a);this.diff_cleanupSemanticLossless(a);for(f=1;f<a.length;){if(-1==a[f-1][0]&&1==a[f][0]){b=a[f-1][1];c=a[f][1];
-d=this.diff_commonOverlap_(b,c);e=this.diff_commonOverlap_(c,b);if(d>=e){if(d>=b.length/2||d>=c.length/2)a.splice(f,0,[0,c.substring(0,d)]),a[f-1][1]=b.substring(0,b.length-d),a[f+1][1]=c.substring(d),f++}else if(e>=b.length/2||e>=c.length/2)a.splice(f,0,[0,b.substring(0,e)]),a[f-1][0]=1,a[f-1][1]=c.substring(0,c.length-e),a[f+1][0]=-1,a[f+1][1]=b.substring(e),f++;f++}f++}};
-diff_match_patch.prototype.diff_cleanupSemanticLossless=function(a){function b(a,b){if(!a||!b)return 6;var c=a.charAt(a.length-1),d=b.charAt(0),e=c.match(diff_match_patch.nonAlphaNumericRegex_),f=d.match(diff_match_patch.nonAlphaNumericRegex_),g=e&&c.match(diff_match_patch.whitespaceRegex_),h=f&&d.match(diff_match_patch.whitespaceRegex_),c=g&&c.match(diff_match_patch.linebreakRegex_),d=h&&d.match(diff_match_patch.linebreakRegex_),i=c&&a.match(diff_match_patch.blanklineEndRegex_),j=d&&b.match(diff_match_patch.blanklineStartRegex_);
-return i||j?5:c||d?4:e&&!g&&h?3:g||h?2:e||f?1:0}for(var c=1;c<a.length-1;){if(0==a[c-1][0]&&0==a[c+1][0]){var d=a[c-1][1],e=a[c][1],f=a[c+1][1],g=this.diff_commonSuffix(d,e);if(g)var h=e.substring(e.length-g),d=d.substring(0,d.length-g),e=h+e.substring(0,e.length-g),f=h+f;for(var g=d,h=e,j=f,i=b(d,e)+b(e,f);e.charAt(0)===f.charAt(0);){var d=d+e.charAt(0),e=e.substring(1)+f.charAt(0),f=f.substring(1),k=b(d,e)+b(e,f);k>=i&&(i=k,g=d,h=e,j=f)}a[c-1][1]!=g&&(g?a[c-1][1]=g:(a.splice(c-1,1),c--),a[c][1]=
-h,j?a[c+1][1]=j:(a.splice(c+1,1),c--))}c++}};diff_match_patch.nonAlphaNumericRegex_=/[^a-zA-Z0-9]/;diff_match_patch.whitespaceRegex_=/\s/;diff_match_patch.linebreakRegex_=/[\r\n]/;diff_match_patch.blanklineEndRegex_=/\n\r?\n$/;diff_match_patch.blanklineStartRegex_=/^\r?\n\r?\n/;
-diff_match_patch.prototype.diff_cleanupEfficiency=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=!1,h=!1,j=!1,i=!1;f<a.length;){if(0==a[f][0])a[f][1].length<this.Diff_EditCost&&(j||i)?(c[d++]=f,g=j,h=i,e=a[f][1]):(d=0,e=null),j=i=!1;else if(-1==a[f][0]?i=!0:j=!0,e&&(g&&h&&j&&i||e.length<this.Diff_EditCost/2&&3==g+h+j+i))a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,e=null,g&&h?(j=i=!0,d=0):(d--,f=0<d?c[d-1]:-1,j=i=!1),b=!0;f++}b&&this.diff_cleanupMerge(a)};
-diff_match_patch.prototype.diff_cleanupMerge=function(a){a.push([0,""]);for(var b=0,c=0,d=0,e="",f="",g;b<a.length;)switch(a[b][0]){case 1:d++;f+=a[b][1];b++;break;case -1:c++;e+=a[b][1];b++;break;case 0:1<c+d?(0!==c&&0!==d&&(g=this.diff_commonPrefix(f,e),0!==g&&(0<b-c-d&&0==a[b-c-d-1][0]?a[b-c-d-1][1]+=f.substring(0,g):(a.splice(0,0,[0,f.substring(0,g)]),b++),f=f.substring(g),e=e.substring(g)),g=this.diff_commonSuffix(f,e),0!==g&&(a[b][1]=f.substring(f.length-g)+a[b][1],f=f.substring(0,f.length-
-g),e=e.substring(0,e.length-g))),0===c?a.splice(b-d,c+d,[1,f]):0===d?a.splice(b-c,c+d,[-1,e]):a.splice(b-c-d,c+d,[-1,e],[1,f]),b=b-c-d+(c?1:0)+(d?1:0)+1):0!==b&&0==a[b-1][0]?(a[b-1][1]+=a[b][1],a.splice(b,1)):b++,c=d=0,f=e=""}""===a[a.length-1][1]&&a.pop();c=!1;for(b=1;b<a.length-1;)0==a[b-1][0]&&0==a[b+1][0]&&(a[b][1].substring(a[b][1].length-a[b-1][1].length)==a[b-1][1]?(a[b][1]=a[b-1][1]+a[b][1].substring(0,a[b][1].length-a[b-1][1].length),a[b+1][1]=a[b-1][1]+a[b+1][1],a.splice(b-1,1),c=!0):a[b][1].substring(0,
-a[b+1][1].length)==a[b+1][1]&&(a[b-1][1]+=a[b+1][1],a[b][1]=a[b][1].substring(a[b+1][1].length)+a[b+1][1],a.splice(b+1,1),c=!0)),b++;c&&this.diff_cleanupMerge(a)};diff_match_patch.prototype.diff_xIndex=function(a,b){var c=0,d=0,e=0,f=0,g;for(g=0;g<a.length;g++){1!==a[g][0]&&(c+=a[g][1].length);-1!==a[g][0]&&(d+=a[g][1].length);if(c>b)break;e=c;f=d}return a.length!=g&&-1===a[g][0]?f:f+(b-e)};
-diff_match_patch.prototype.diff_prettyHtml=function(a){for(var b=[],c=/&/g,d=/</g,e=/>/g,f=/\n/g,g=0;g<a.length;g++){var h=a[g][0],j=a[g][1],j=j.replace(c,"&amp;").replace(d,"&lt;").replace(e,"&gt;").replace(f,"&para;<br>");switch(h){case 1:b[g]='<ins style="background:#e6ffe6;">'+j+"</ins>";break;case -1:b[g]='<del style="background:#ffe6e6;">'+j+"</del>";break;case 0:b[g]="<span>"+j+"</span>"}}return b.join("")};
-diff_match_patch.prototype.diff_text1=function(a){for(var b=[],c=0;c<a.length;c++)1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_text2=function(a){for(var b=[],c=0;c<a.length;c++)-1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_levenshtein=function(a){for(var b=0,c=0,d=0,e=0;e<a.length;e++){var f=a[e][0],g=a[e][1];switch(f){case 1:c+=g.length;break;case -1:d+=g.length;break;case 0:b+=Math.max(c,d),d=c=0}}return b+=Math.max(c,d)};
-diff_match_patch.prototype.diff_toDelta=function(a){for(var b=[],c=0;c<a.length;c++)switch(a[c][0]){case 1:b[c]="+"+encodeURI(a[c][1]);break;case -1:b[c]="-"+a[c][1].length;break;case 0:b[c]="="+a[c][1].length}return b.join("\t").replace(/%20/g," ")};
-diff_match_patch.prototype.diff_fromDelta=function(a,b){for(var c=[],d=0,e=0,f=b.split(/\t/g),g=0;g<f.length;g++){var h=f[g].substring(1);switch(f[g].charAt(0)){case "+":try{c[d++]=[1,decodeURI(h)]}catch(j){throw Error("Illegal escape in diff_fromDelta: "+h);}break;case "-":case "=":var i=parseInt(h,10);if(isNaN(i)||0>i)throw Error("Invalid number in diff_fromDelta: "+h);h=a.substring(e,e+=i);"="==f[g].charAt(0)?c[d++]=[0,h]:c[d++]=[-1,h];break;default:if(f[g])throw Error("Invalid diff operation in diff_fromDelta: "+
-f[g]);}}if(e!=a.length)throw Error("Delta length ("+e+") does not equal source text length ("+a.length+").");return c};diff_match_patch.prototype.match_main=function(a,b,c){if(null==a||null==b||null==c)throw Error("Null input. (match_main)");c=Math.max(0,Math.min(c,a.length));return a==b?0:a.length?a.substring(c,c+b.length)==b?c:this.match_bitap_(a,b,c):-1};
-diff_match_patch.prototype.match_bitap_=function(a,b,c){function d(a,d){var e=a/b.length,g=Math.abs(c-d);return!f.Match_Distance?g?1:e:e+g/f.Match_Distance}if(b.length>this.Match_MaxBits)throw Error("Pattern too long for this browser.");var e=this.match_alphabet_(b),f=this,g=this.Match_Threshold,h=a.indexOf(b,c);-1!=h&&(g=Math.min(d(0,h),g),h=a.lastIndexOf(b,c+b.length),-1!=h&&(g=Math.min(d(0,h),g)));for(var j=1<<b.length-1,h=-1,i,k,q=b.length+a.length,r,t=0;t<b.length;t++){i=0;for(k=q;i<k;)d(t,c+
-k)<=g?i=k:q=k,k=Math.floor((q-i)/2+i);q=k;i=Math.max(1,c-k+1);var p=Math.min(c+k,a.length)+b.length;k=Array(p+2);for(k[p+1]=(1<<t)-1;p>=i;p--){var w=e[a.charAt(p-1)];k[p]=0===t?(k[p+1]<<1|1)&w:(k[p+1]<<1|1)&w|((r[p+1]|r[p])<<1|1)|r[p+1];if(k[p]&j&&(w=d(t,p-1),w<=g))if(g=w,h=p-1,h>c)i=Math.max(1,2*c-h);else break}if(d(t+1,c)>g)break;r=k}return h};
-diff_match_patch.prototype.match_alphabet_=function(a){for(var b={},c=0;c<a.length;c++)b[a.charAt(c)]=0;for(c=0;c<a.length;c++)b[a.charAt(c)]|=1<<a.length-c-1;return b};
-diff_match_patch.prototype.patch_addContext_=function(a,b){if(0!=b.length){for(var c=b.substring(a.start2,a.start2+a.length1),d=0;b.indexOf(c)!=b.lastIndexOf(c)&&c.length<this.Match_MaxBits-this.Patch_Margin-this.Patch_Margin;)d+=this.Patch_Margin,c=b.substring(a.start2-d,a.start2+a.length1+d);d+=this.Patch_Margin;(c=b.substring(a.start2-d,a.start2))&&a.diffs.unshift([0,c]);(d=b.substring(a.start2+a.length1,a.start2+a.length1+d))&&a.diffs.push([0,d]);a.start1-=c.length;a.start2-=c.length;a.length1+=
-c.length+d.length;a.length2+=c.length+d.length}};
-diff_match_patch.prototype.patch_make=function(a,b,c){var d;if("string"==typeof a&&"string"==typeof b&&"undefined"==typeof c)d=a,b=this.diff_main(d,b,!0),2<b.length&&(this.diff_cleanupSemantic(b),this.diff_cleanupEfficiency(b));else if(a&&"object"==typeof a&&"undefined"==typeof b&&"undefined"==typeof c)b=a,d=this.diff_text1(b);else if("string"==typeof a&&b&&"object"==typeof b&&"undefined"==typeof c)d=a;else if("string"==typeof a&&"string"==typeof b&&c&&"object"==typeof c)d=a,b=c;else throw Error("Unknown call format to patch_make.");
-if(0===b.length)return[];c=[];a=new diff_match_patch.patch_obj;for(var e=0,f=0,g=0,h=d,j=0;j<b.length;j++){var i=b[j][0],k=b[j][1];!e&&0!==i&&(a.start1=f,a.start2=g);switch(i){case 1:a.diffs[e++]=b[j];a.length2+=k.length;d=d.substring(0,g)+k+d.substring(g);break;case -1:a.length1+=k.length;a.diffs[e++]=b[j];d=d.substring(0,g)+d.substring(g+k.length);break;case 0:k.length<=2*this.Patch_Margin&&e&&b.length!=j+1?(a.diffs[e++]=b[j],a.length1+=k.length,a.length2+=k.length):k.length>=2*this.Patch_Margin&&
-e&&(this.patch_addContext_(a,h),c.push(a),a=new diff_match_patch.patch_obj,e=0,h=d,f=g)}1!==i&&(f+=k.length);-1!==i&&(g+=k.length)}e&&(this.patch_addContext_(a,h),c.push(a));return c};diff_match_patch.prototype.patch_deepCopy=function(a){for(var b=[],c=0;c<a.length;c++){var d=a[c],e=new diff_match_patch.patch_obj;e.diffs=[];for(var f=0;f<d.diffs.length;f++)e.diffs[f]=d.diffs[f].slice();e.start1=d.start1;e.start2=d.start2;e.length1=d.length1;e.length2=d.length2;b[c]=e}return b};
-diff_match_patch.prototype.patch_apply=function(a,b){if(0==a.length)return[b,[]];a=this.patch_deepCopy(a);var c=this.patch_addPadding(a);b=c+b+c;this.patch_splitMax(a);for(var d=0,e=[],f=0;f<a.length;f++){var g=a[f].start2+d,h=this.diff_text1(a[f].diffs),j,i=-1;if(h.length>this.Match_MaxBits){if(j=this.match_main(b,h.substring(0,this.Match_MaxBits),g),-1!=j&&(i=this.match_main(b,h.substring(h.length-this.Match_MaxBits),g+h.length-this.Match_MaxBits),-1==i||j>=i))j=-1}else j=this.match_main(b,h,g);
-if(-1==j)e[f]=!1,d-=a[f].length2-a[f].length1;else if(e[f]=!0,d=j-g,g=-1==i?b.substring(j,j+h.length):b.substring(j,i+this.Match_MaxBits),h==g)b=b.substring(0,j)+this.diff_text2(a[f].diffs)+b.substring(j+h.length);else if(g=this.diff_main(h,g,!1),h.length>this.Match_MaxBits&&this.diff_levenshtein(g)/h.length>this.Patch_DeleteThreshold)e[f]=!1;else{this.diff_cleanupSemanticLossless(g);for(var h=0,k,i=0;i<a[f].diffs.length;i++){var q=a[f].diffs[i];0!==q[0]&&(k=this.diff_xIndex(g,h));1===q[0]?b=b.substring(0,
-j+k)+q[1]+b.substring(j+k):-1===q[0]&&(b=b.substring(0,j+k)+b.substring(j+this.diff_xIndex(g,h+q[1].length)));-1!==q[0]&&(h+=q[1].length)}}}b=b.substring(c.length,b.length-c.length);return[b,e]};
-diff_match_patch.prototype.patch_addPadding=function(a){for(var b=this.Patch_Margin,c="",d=1;d<=b;d++)c+=String.fromCharCode(d);for(d=0;d<a.length;d++)a[d].start1+=b,a[d].start2+=b;var d=a[0],e=d.diffs;if(0==e.length||0!=e[0][0])e.unshift([0,c]),d.start1-=b,d.start2-=b,d.length1+=b,d.length2+=b;else if(b>e[0][1].length){var f=b-e[0][1].length;e[0][1]=c.substring(e[0][1].length)+e[0][1];d.start1-=f;d.start2-=f;d.length1+=f;d.length2+=f}d=a[a.length-1];e=d.diffs;0==e.length||0!=e[e.length-1][0]?(e.push([0,
-c]),d.length1+=b,d.length2+=b):b>e[e.length-1][1].length&&(f=b-e[e.length-1][1].length,e[e.length-1][1]+=c.substring(0,f),d.length1+=f,d.length2+=f);return c};
-diff_match_patch.prototype.patch_splitMax=function(a){for(var b=this.Match_MaxBits,c=0;c<a.length;c++)if(!(a[c].length1<=b)){var d=a[c];a.splice(c--,1);for(var e=d.start1,f=d.start2,g="";0!==d.diffs.length;){var h=new diff_match_patch.patch_obj,j=!0;h.start1=e-g.length;h.start2=f-g.length;""!==g&&(h.length1=h.length2=g.length,h.diffs.push([0,g]));for(;0!==d.diffs.length&&h.length1<b-this.Patch_Margin;){var g=d.diffs[0][0],i=d.diffs[0][1];1===g?(h.length2+=i.length,f+=i.length,h.diffs.push(d.diffs.shift()),
-j=!1):-1===g&&1==h.diffs.length&&0==h.diffs[0][0]&&i.length>2*b?(h.length1+=i.length,e+=i.length,j=!1,h.diffs.push([g,i]),d.diffs.shift()):(i=i.substring(0,b-h.length1-this.Patch_Margin),h.length1+=i.length,e+=i.length,0===g?(h.length2+=i.length,f+=i.length):j=!1,h.diffs.push([g,i]),i==d.diffs[0][1]?d.diffs.shift():d.diffs[0][1]=d.diffs[0][1].substring(i.length))}g=this.diff_text2(h.diffs);g=g.substring(g.length-this.Patch_Margin);i=this.diff_text1(d.diffs).substring(0,this.Patch_Margin);""!==i&&
-(h.length1+=i.length,h.length2+=i.length,0!==h.diffs.length&&0===h.diffs[h.diffs.length-1][0]?h.diffs[h.diffs.length-1][1]+=i:h.diffs.push([0,i]));j||a.splice(++c,0,h)}}};diff_match_patch.prototype.patch_toText=function(a){for(var b=[],c=0;c<a.length;c++)b[c]=a[c];return b.join("")};
-diff_match_patch.prototype.patch_fromText=function(a){var b=[];if(!a)return b;a=a.split("\n");for(var c=0,d=/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/;c<a.length;){var e=a[c].match(d);if(!e)throw Error("Invalid patch string: "+a[c]);var f=new diff_match_patch.patch_obj;b.push(f);f.start1=parseInt(e[1],10);""===e[2]?(f.start1--,f.length1=1):"0"==e[2]?f.length1=0:(f.start1--,f.length1=parseInt(e[2],10));f.start2=parseInt(e[3],10);""===e[4]?(f.start2--,f.length2=1):"0"==e[4]?f.length2=0:(f.start2--,f.length2=
-parseInt(e[4],10));for(c++;c<a.length;){e=a[c].charAt(0);try{var g=decodeURI(a[c].substring(1))}catch(h){throw Error("Illegal escape in patch_fromText: "+g);}if("-"==e)f.diffs.push([-1,g]);else if("+"==e)f.diffs.push([1,g]);else if(" "==e)f.diffs.push([0,g]);else if("@"==e)break;else if(""!==e)throw Error('Invalid patch mode "'+e+'" in: '+g);c++}}return b};diff_match_patch.patch_obj=function(){this.diffs=[];this.start2=this.start1=null;this.length2=this.length1=0};
-diff_match_patch.patch_obj.prototype.toString=function(){var a,b;a=0===this.length1?this.start1+",0":1==this.length1?this.start1+1:this.start1+1+","+this.length1;b=0===this.length2?this.start2+",0":1==this.length2?this.start2+1:this.start2+1+","+this.length2;a=["@@ -"+a+" +"+b+" @@\n"];var c;for(b=0;b<this.diffs.length;b++){switch(this.diffs[b][0]){case 1:c="+";break;case -1:c="-";break;case 0:c=" "}a[b+1]=c+encodeURI(this.diffs[b][1])+"\n"}return a.join("").replace(/%20/g," ")};
-this.diff_match_patch=diff_match_patch;this.DIFF_DELETE=-1;this.DIFF_INSERT=1;this.DIFF_EQUAL=0;})()

applications/admin/static/codemirror/addon/merge/merge.css

@@ -1,92 +0,0 @@
-.CodeMirror-merge {
-  position: relative;
-  border: 1px solid #ddd;
-  white-space: pre;
-}
-
-.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
-  height: 350px;
-}
-
-.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 47%; }
-.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 6%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
-
-.CodeMirror-merge-pane {
-  display: inline-block;
-  white-space: normal;
-  vertical-align: top;
-}
-.CodeMirror-merge-pane-rightmost {
-  position: absolute;
-  right: 0px;
-  z-index: 1;
-}
-
-.CodeMirror-merge-gap {
-  z-index: 2;
-  display: inline-block;
-  height: 100%;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  overflow: hidden;
-  border-left: 1px solid #ddd;
-  border-right: 1px solid #ddd;
-  position: relative;
-  background: #f8f8f8;
-}
-
-.CodeMirror-merge-scrolllock-wrap {
-  position: absolute;
-  bottom: 0; left: 50%;
-}
-.CodeMirror-merge-scrolllock {
-  position: relative;
-  left: -50%;
-  cursor: pointer;
-  color: #555;
-  line-height: 1;
-}
-
-.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
-  position: absolute;
-  left: 0; top: 0;
-  right: 0; bottom: 0;
-  line-height: 1;
-}
-
-.CodeMirror-merge-copy {
-  position: absolute;
-  cursor: pointer;
-  color: #44c;
-}
-
-.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
-.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
-
-.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-chunk { background: #ffffe0; }
-.CodeMirror-merge-r-chunk-start { border-top: 1px solid #ee8; }
-.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #ee8; }
-.CodeMirror-merge-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
-
-.CodeMirror-merge-l-chunk { background: #eef; }
-.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
-.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
-.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
-
-.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
-.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
-.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }

applications/admin/static/codemirror/addon/merge/merge.js

@@ -1,479 +0,0 @@
-(function() {
-  "use strict";
-  // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
-
-  var Pos = CodeMirror.Pos;
-  var svgNS = "http://www.w3.org/2000/svg";
-
-  function DiffView(mv, type) {
-    this.mv = mv;
-    this.type = type;
-    this.classes = type == "left"
-      ? {chunk: "CodeMirror-merge-l-chunk",
-         start: "CodeMirror-merge-l-chunk-start",
-         end: "CodeMirror-merge-l-chunk-end",
-         insert: "CodeMirror-merge-l-inserted",
-         del: "CodeMirror-merge-l-deleted",
-         connect: "CodeMirror-merge-l-connect"}
-      : {chunk: "CodeMirror-merge-r-chunk",
-         start: "CodeMirror-merge-r-chunk-start",
-         end: "CodeMirror-merge-r-chunk-end",
-         insert: "CodeMirror-merge-r-inserted",
-         del: "CodeMirror-merge-r-deleted",
-         connect: "CodeMirror-merge-r-connect"};
-  }
-
-  DiffView.prototype = {
-    constructor: DiffView,
-    init: function(pane, orig, options) {
-      this.edit = this.mv.edit;
-      this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: true}, copyObj(options)));
-
-      this.diff = getDiff(asString(orig), asString(options.value));
-      this.diffOutOfDate = false;
-
-      this.showDifferences = options.showDifferences !== false;
-      this.forceUpdate = registerUpdate(this);
-      setScrollLock(this, true, false);
-      registerScroll(this);
-    },
-    setShowDifferences: function(val) {
-      val = val !== false;
-      if (val != this.showDifferences) {
-        this.showDifferences = val;
-        this.forceUpdate("full");
-      }
-    }
-  };
-
-  function registerUpdate(dv) {
-    var edit = {from: 0, to: 0, marked: []};
-    var orig = {from: 0, to: 0, marked: []};
-    var debounceChange;
-    function update(mode) {
-      if (mode == "full") {
-        if (dv.svg) clear(dv.svg);
-        clear(dv.copyButtons);
-        clearMarks(dv.edit, edit.marked, dv.classes);
-        clearMarks(dv.orig, orig.marked, dv.classes);
-        edit.from = edit.to = orig.from = orig.to = 0;
-      }
-      if (dv.diffOutOfDate) {
-        dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
-        dv.diffOutOfDate = false;
-        CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
-      }
-      if (dv.showDifferences) {
-        updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
-        updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
-      }
-      drawConnectors(dv);
-    }
-    function set(slow) {
-      clearTimeout(debounceChange);
-      debounceChange = setTimeout(update, slow == true ? 250 : 100);
-    }
-    function change() {
-      if (!dv.diffOutOfDate) {
-        dv.diffOutOfDate = true;
-        edit.from = edit.to = orig.from = orig.to = 0;
-      }
-      set(true);
-    }
-    dv.edit.on("change", change);
-    dv.orig.on("change", change);
-    dv.edit.on("viewportChange", set);
-    dv.orig.on("viewportChange", set);
-    update();
-    return update;
-  }
-
-  function registerScroll(dv) {
-    dv.edit.on("scroll", function() {
-      syncScroll(dv, DIFF_INSERT) && drawConnectors(dv);
-    });
-    dv.orig.on("scroll", function() {
-      syncScroll(dv, DIFF_DELETE) && drawConnectors(dv);
-    });
-  }
-
-  function syncScroll(dv, type) {
-    // Change handler will do a refresh after a timeout when diff is out of date
-    if (dv.diffOutOfDate) return false;
-    if (!dv.lockScroll) return true;
-    var editor, other, now = +new Date;
-    if (type == DIFF_INSERT) { editor = dv.edit; other = dv.orig; }
-    else { editor = dv.orig; other = dv.edit; }
-    // Don't take action if the position of this editor was recently set
-    // (to prevent feedback loops)
-    if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 50 > now) return false;
-
-    var sInfo = editor.getScrollInfo(), halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
-    var mid = editor.lineAtHeight(midY, "local");
-    var around = chunkBoundariesAround(dv.diff, mid, type == DIFF_INSERT);
-    var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
-    var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
-    var ratio = (midY - off.top) / (off.bot - off.top);
-    var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
-
-    var botDist, mix;
-    // Some careful tweaking to make sure no space is left out of view
-    // when scrolling to top or bottom.
-    if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
-      targetPos = targetPos * mix + sInfo.top * (1 - mix);
-    } else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
-      var otherInfo = other.getScrollInfo();
-      var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos;
-      if (botDistOther > botDist && (mix = botDist / halfScreen) < 1)
-        targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
-    }
-
-    other.scrollTo(sInfo.left, targetPos);
-    other.state.scrollSetAt = now;
-    other.state.scrollSetBy = dv;
-    return true;
-  }
-
-  function getOffsets(editor, around) {
-    var bot = around.after;
-    if (bot == null) bot = editor.lastLine() + 1;
-    return {top: editor.heightAtLine(around.before || 0, "local"),
-            bot: editor.heightAtLine(bot, "local")};
-  }
-
-  function setScrollLock(dv, val, action) {
-    dv.lockScroll = val;
-    if (val && action != false) syncScroll(dv, DIFF_INSERT) && drawConnectors(dv);
-    dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db&nbsp;&nbsp;\u21da";
-  }
-
-  // Updating the marks for editor content
-
-  function clearMarks(editor, arr, classes) {
-    for (var i = 0; i < arr.length; ++i) {
-      var mark = arr[i];
-      if (mark instanceof CodeMirror.TextMarker) {
-        mark.clear();
-      } else {
-        editor.removeLineClass(mark, "background", classes.chunk);
-        editor.removeLineClass(mark, "background", classes.start);
-        editor.removeLineClass(mark, "background", classes.end);
-      }
-    }
-    arr.length = 0;
-  }
-
-  // FIXME maybe add a margin around viewport to prevent too many updates
-  function updateMarks(editor, diff, state, type, classes) {
-    var vp = editor.getViewport();
-    editor.operation(function() {
-      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
-        clearMarks(editor, state.marked, classes);
-        markChanges(editor, diff, type, state.marked, vp.from, vp.to, classes);
-        state.from = vp.from; state.to = vp.to;
-      } else {
-        if (vp.from < state.from) {
-          markChanges(editor, diff, type, state.marked, vp.from, state.from, classes);
-          state.from = vp.from;
-        }
-        if (vp.to > state.to) {
-          markChanges(editor, diff, type, state.marked, state.to, vp.to, classes);
-          state.to = vp.to;
-        }
-      }
-    });
-  }
-
-  function markChanges(editor, diff, type, marks, from, to, classes) {
-    var pos = Pos(0, 0);
-    var top = Pos(from, 0), bot = editor.clipPos(Pos(to - 1));
-    var cls = type == DIFF_DELETE ? classes.del : classes.insert;
-    function markChunk(start, end) {
-      var bfrom = Math.max(from, start), bto = Math.min(to, end);
-      for (var i = bfrom; i < bto; ++i) {
-        var line = editor.addLineClass(i, "background", classes.chunk);
-        if (i == start) editor.addLineClass(line, "background", classes.start);
-        if (i == end - 1) editor.addLineClass(line, "background", classes.end);
-        marks.push(line);
-      }
-      // When the chunk is empty, make sure a horizontal line shows up
-      if (start == end && bfrom == end && bto == end) {
-        if (bfrom)
-          marks.push(editor.addLineClass(bfrom - 1, "background", classes.end));
-        else
-          marks.push(editor.addLineClass(bfrom, "background", classes.start));
-      }
-    }
-
-    var chunkStart = 0;
-    for (var i = 0; i < diff.length; ++i) {
-      var part = diff[i], tp = part[0], str = part[1];
-      if (tp == DIFF_EQUAL) {
-        var cleanFrom = pos.line + (startOfLineClean(diff, i) ? 0 : 1);
-        moveOver(pos, str);
-        var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0);
-        if (cleanTo > cleanFrom) {
-          if (i) markChunk(chunkStart, cleanFrom);
-          chunkStart = cleanTo;
-        }
-      } else {
-        if (tp == type) {
-          var end = moveOver(pos, str, true);
-          var a = posMax(top, pos), b = posMin(bot, end);
-          if (!posEq(a, b))
-            marks.push(editor.markText(a, b, {className: cls}));
-          pos = end;
-        }
-      }
-    }
-    if (chunkStart <= pos.line) markChunk(chunkStart, pos.line + 1);
-  }
-
-  // Updating the gap between editor and original
-
-  function drawConnectors(dv) {
-    if (!dv.showDifferences) return;
-
-    if (dv.svg) {
-      clear(dv.svg);
-      var w = dv.gap.offsetWidth;
-      attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
-    }
-    clear(dv.copyButtons);
-
-    var flip = dv.type == "left";
-    var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
-    var sTopEdit = dv.edit.getScrollInfo().top, sTopOrig = dv.orig.getScrollInfo().top;
-    iterateChunks(dv.diff, function(topOrig, botOrig, topEdit, botEdit) {
-      if (topEdit > vpEdit.to || botEdit < vpEdit.from ||
-          topOrig > vpOrig.to || botOrig < vpOrig.from)
-        return;
-      var topLpx = dv.orig.heightAtLine(topOrig, "local") - sTopOrig, top = topLpx;
-      if (dv.svg) {
-        var topRpx = dv.edit.heightAtLine(topEdit, "local") - sTopEdit;
-        if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
-        var botLpx = dv.orig.heightAtLine(botOrig, "local") - sTopOrig;
-        var botRpx = dv.edit.heightAtLine(botEdit, "local") - sTopEdit;
-        if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
-        var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
-        var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
-        attrs(dv.svg.appendChild(document.createElementNS(svgNS, "path")),
-              "d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
-              "class", dv.classes.connect);
-      }
-      var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
-                                                "CodeMirror-merge-copy"));
-      copy.title = "Revert chunk";
-      copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
-      copy.style.top = top + "px";
-    });
-  }
-
-  function copyChunk(dv, chunk) {
-    if (dv.diffOutOfDate) return;
-    dv.edit.replaceRange(dv.orig.getRange(Pos(chunk.topOrig, 0), Pos(chunk.botOrig, 0)),
-                         Pos(chunk.topEdit, 0), Pos(chunk.botEdit, 0));
-  }
-
-  // Merge view, containing 0, 1, or 2 diff views.
-
-  var MergeView = CodeMirror.MergeView = function(node, options) {
-    if (!(this instanceof MergeView)) return new MergeView(node, options);
-
-    var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
-    var hasLeft = origLeft != null, hasRight = origRight != null;
-    var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
-    var wrap = [], left = this.left = null, right = this.right = null;
-
-    if (hasLeft) {
-      left = this.left = new DiffView(this, "left");
-      var leftPane = elt("div", null, "CodeMirror-merge-pane");
-      wrap.push(leftPane);
-      wrap.push(buildGap(left));
-    }
-
-    var editPane = elt("div", null, "CodeMirror-merge-pane");
-    wrap.push(editPane);
-
-    if (hasRight) {
-      right = this.right = new DiffView(this, "right");
-      wrap.push(buildGap(right));
-      var rightPane = elt("div", null, "CodeMirror-merge-pane");
-      wrap.push(rightPane);
-    }
-
-    (hasRight ? rightPane : editPane).className += " CodeMirror-merge-pane-rightmost";
-
-    wrap.push(elt("div", null, null, "height: 0; clear: both;"));
-    var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-merge CodeMirror-merge-" + panes + "pane"));
-    this.edit = CodeMirror(editPane, copyObj(options));
-
-    if (left) left.init(leftPane, origLeft, options);
-    if (right) right.init(rightPane, origRight, options);
-
-    var onResize = function() {
-      if (left) drawConnectors(left);
-      if (right) drawConnectors(right);
-    };
-    CodeMirror.on(window, "resize", onResize);
-    var resizeInterval = setInterval(function() {
-      for (var p = wrapElt.parentNode; p && p != document.body; p = p.parentNode) {}
-      if (!p) { clearInterval(resizeInterval); CodeMirror.off(window, "resize", onResize); }
-    }, 5000);
-  };
-
-  function buildGap(dv) {
-    var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
-    lock.title = "Toggle locked scrolling";
-    var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
-    CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
-    dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
-    CodeMirror.on(dv.copyButtons, "click", function(e) {
-      var node = e.target || e.srcElement;
-      if (node.chunk) copyChunk(dv, node.chunk);
-    });
-    var gapElts = [dv.copyButtons, lockWrap];
-    var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
-    if (svg && !svg.createSVGRect) svg = null;
-    dv.svg = svg;
-    if (svg) gapElts.push(svg);
-
-    return dv.gap = elt("div", gapElts, "CodeMirror-merge-gap");
-  }
-
-  MergeView.prototype = {
-    constuctor: MergeView,
-    editor: function() { return this.edit; },
-    rightOriginal: function() { return this.right && this.right.orig; },
-    leftOriginal: function() { return this.left && this.left.orig; },
-    setShowDifferences: function(val) {
-      if (this.right) this.right.setShowDifferences(val);
-      if (this.left) this.left.setShowDifferences(val);
-    }
-  };
-
-  function asString(obj) {
-    if (typeof obj == "string") return obj;
-    else return obj.getValue();
-  }
-
-  // Operations on diffs
-
-  var dmp = new diff_match_patch();
-  function getDiff(a, b) {
-    var diff = dmp.diff_main(a, b);
-    dmp.diff_cleanupSemantic(diff);
-    // The library sometimes leaves in empty parts, which confuse the algorithm
-    for (var i = 0; i < diff.length; ++i) {
-      var part = diff[i];
-      if (!part[1]) {
-        diff.splice(i--, 1);
-      } else if (i && diff[i - 1][0] == part[0]) {
-        diff.splice(i--, 1);
-        diff[i][1] += part[1];
-      }
-    }
-    return diff;
-  }
-
-  function iterateChunks(diff, f) {
-    var startEdit = 0, startOrig = 0;
-    var edit = Pos(0, 0), orig = Pos(0, 0);
-    for (var i = 0; i < diff.length; ++i) {
-      var part = diff[i], tp = part[0];
-      if (tp == DIFF_EQUAL) {
-        var startOff = startOfLineClean(diff, i) ? 0 : 1;
-        var cleanFromEdit = edit.line + startOff, cleanFromOrig = orig.line + startOff;
-        moveOver(edit, part[1], null, orig);
-        var endOff = endOfLineClean(diff, i) ? 1 : 0;
-        var cleanToEdit = edit.line + endOff, cleanToOrig = orig.line + endOff;
-        if (cleanToEdit > cleanFromEdit) {
-          if (i) f(startOrig, cleanFromOrig, startEdit, cleanFromEdit);
-          startEdit = cleanToEdit; startOrig = cleanToOrig;
-        }
-      } else {
-        moveOver(tp == DIFF_INSERT ? edit : orig, part[1]);
-      }
-    }
-    if (startEdit <= edit.line || startOrig <= orig.line)
-      f(startOrig, orig.line + 1, startEdit, edit.line + 1);
-  }
-
-  function endOfLineClean(diff, i) {
-    if (i == diff.length - 1) return true;
-    var next = diff[i + 1][1];
-    if (next.length == 1 || next.charCodeAt(0) != 10) return false;
-    if (i == diff.length - 2) return true;
-    next = diff[i + 2][1];
-    return next.length > 1 && next.charCodeAt(0) == 10;
-  }
-
-  function startOfLineClean(diff, i) {
-    if (i == 0) return true;
-    var last = diff[i - 1][1];
-    if (last.charCodeAt(last.length - 1) != 10) return false;
-    if (i == 1) return true;
-    last = diff[i - 2][1];
-    return last.charCodeAt(last.length - 1) == 10;
-  }
-
-  function chunkBoundariesAround(diff, n, nInEdit) {
-    var beforeE, afterE, beforeO, afterO;
-    iterateChunks(diff, function(fromOrig, toOrig, fromEdit, toEdit) {
-      var fromLocal = nInEdit ? fromEdit : fromOrig;
-      var toLocal = nInEdit ? toEdit : toOrig;
-      if (afterE == null) {
-        if (fromLocal > n) { afterE = fromEdit; afterO = fromOrig; }
-        else if (toLocal > n) { afterE = toEdit; afterO = toOrig; }
-      }
-      if (toLocal <= n) { beforeE = toEdit; beforeO = toOrig; }
-      else if (fromLocal <= n) { beforeE = fromEdit; beforeO = fromOrig; }
-    });
-    return {edit: {before: beforeE, after: afterE}, orig: {before: beforeO, after: afterO}};
-  }
-
-  // General 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;
-  }
-
-  function clear(node) {
-    for (var count = node.childNodes.length; count > 0; --count)
-      node.removeChild(node.firstChild);
-  }
-
-  function attrs(elt) {
-    for (var i = 1; i < arguments.length; i += 2)
-      elt.setAttribute(arguments[i], arguments[i+1]);
-  }
-
-  function copyObj(obj, target) {
-    if (!target) target = {};
-    for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
-    return target;
-  }
-
-  function moveOver(pos, str, copy, other) {
-    var out = copy ? Pos(pos.line, pos.ch) : pos, at = 0;
-    for (;;) {
-      var nl = str.indexOf("\n", at);
-      if (nl == -1) break;
-      ++out.line;
-      if (other) ++other.line;
-      at = nl + 1;
-    }
-    out.ch = (at ? 0 : out.ch) + (str.length - at);
-    if (other) other.ch = (at ? 0 : other.ch) + (str.length - at);
-    return out;
-  }
-
-  function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
-  function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
-  function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
-})();

applications/admin/static/codemirror/addon/mode/loadmode.js

@@ -1,4 +1,14 @@
-(function() {
+// 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"), "cjs");
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], function(CM) { mod(CM, "amd"); });
+  else // Plain browser env
+    mod(CodeMirror, "plain");
+})(function(CodeMirror, env) {
   if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
 
   var loading = {};
@@ -25,21 +35,24 @@
     if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
     if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
 
-    var script = document.createElement("script");
-    script.src = CodeMirror.modeURL.replace(/%N/g, mode);
-    var others = document.getElementsByTagName("script")[0];
-    others.parentNode.insertBefore(script, others);
-    var list = loading[mode] = [cont];
-    var count = 0, poll = setInterval(function() {
-      if (++count > 100) return clearInterval(poll);
-      if (CodeMirror.modes.hasOwnProperty(mode)) {
-        clearInterval(poll);
-        loading[mode] = null;
+    var file = CodeMirror.modeURL.replace(/%N/g, mode);
+    if (env == "plain") {
+      var script = document.createElement("script");
+      script.src = file;
+      var others = document.getElementsByTagName("script")[0];
+      var list = loading[mode] = [cont];
+      CodeMirror.on(script, "load", function() {
         ensureDeps(mode, function() {
           for (var i = 0; i < list.length; ++i) list[i]();
         });
-      }
-    }, 200);
+      });
+      others.parentNode.insertBefore(script, others);
+    } else if (env == "cjs") {
+      require(file);
+      cont();
+    } else if (env == "amd") {
+      requirejs([file], cont);
+    }
   };
 
   CodeMirror.autoLoadMode = function(instance, mode) {
@@ -48,4 +61,4 @@
         instance.setOption("mode", instance.getOption("mode"));
       });
   };
-}());
+});

applications/admin/static/codemirror/addon/mode/multiplex.js

@@ -1,3 +1,16 @@
+// 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.multiplexingMode = function(outer /*, others */) {
   // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
   var others = Array.prototype.slice.call(arguments, 1);
@@ -101,3 +114,5 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
     }
   };
 };
+
+});

applications/admin/static/codemirror/addon/mode/multiplex_test.js

@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   CodeMirror.defineMode("markdown_with_stex", function(){
     var inner = CodeMirror.getMode({}, "stex");

applications/admin/static/codemirror/addon/mode/overlay.js

@@ -1,20 +1,34 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Utility function that allows modes to be combined. The mode given
 // as the base argument takes care of most of the normal mode
 // functionality, but a second (typically simple) mode is used, which
 // can override the style of text. Both modes get to parse all of the
 // text, but when both assign a non-null style to a piece of code, the
-// overlay wins, unless the combine argument was true, in which case
-// the styles are combined.
+// overlay wins, unless the combine argument was true and not overridden,
+// or state.overlay.combineTokens was true, in which case the styles are
+// combined.
 
-// overlayParser is the old, deprecated name
-CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, combine) {
+(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.overlayMode = function(base, overlay, combine) {
   return {
     startState: function() {
       return {
         base: CodeMirror.startState(base),
         overlay: CodeMirror.startState(overlay),
         basePos: 0, baseCur: null,
-        overlayPos: 0, overlayCur: null
+        overlayPos: 0, overlayCur: null,
+        streamSeen: null
       };
     },
     copyState: function(state) {
@@ -27,6 +41,12 @@ CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, comb
     },
 
     token: function(stream, state) {
+      if (stream != state.streamSeen ||
+          Math.min(state.basePos, state.overlayPos) < stream.start) {
+        state.streamSeen = stream;
+        state.basePos = state.overlayPos = stream.start;
+      }
+
       if (stream.start == state.basePos) {
         state.baseCur = base.token(stream, state.base);
         state.basePos = stream.pos;
@@ -37,10 +57,14 @@ CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, comb
         state.overlayPos = stream.pos;
       }
       stream.pos = Math.min(state.basePos, state.overlayPos);
-      if (stream.eol()) state.basePos = state.overlayPos = 0;
 
+      // state.overlay.combineTokens always takes precedence over combine,
+      // unless set to null
       if (state.overlayCur == null) return state.baseCur;
-      if (state.baseCur != null && combine) return state.baseCur + " " + state.overlayCur;
+      else if (state.baseCur != null &&
+               state.overlay.combineTokens ||
+               combine && state.overlay.combineTokens == null)
+        return state.baseCur + " " + state.overlayCur;
       else return state.overlayCur;
     },
 
@@ -57,3 +81,5 @@ CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, comb
     }
   };
 };
+
+});

applications/admin/static/codemirror/addon/mode/simple.js

@@ -0,0 +1,213 @@
+// 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.defineSimpleMode = function(name, states) {
+    CodeMirror.defineMode(name, function(config) {
+      return CodeMirror.simpleMode(config, states);
+    });
+  };
+
+  CodeMirror.simpleMode = function(config, states) {
+    ensureState(states, "start");
+    var states_ = {}, meta = states.meta || {}, hasIndentation = false;
+    for (var state in states) if (state != meta && states.hasOwnProperty(state)) {
+      var list = states_[state] = [], orig = states[state];
+      for (var i = 0; i < orig.length; i++) {
+        var data = orig[i];
+        list.push(new Rule(data, states));
+        if (data.indent || data.dedent) hasIndentation = true;
+      }
+    }
+    var mode = {
+      startState: function() {
+        return {state: "start", pending: null,
+                local: null, localState: null,
+                indent: hasIndentation ? [] : null};
+      },
+      copyState: function(state) {
+        var s = {state: state.state, pending: state.pending,
+                 local: state.local, localState: null,
+                 indent: state.indent && state.indent.slice(0)};
+        if (state.localState)
+          s.localState = CodeMirror.copyState(state.local.mode, state.localState);
+        if (state.stack)
+          s.stack = state.stack.slice(0);
+        for (var pers = state.persistentStates; pers; pers = pers.next)
+          s.persistentStates = {mode: pers.mode,
+                                spec: pers.spec,
+                                state: pers.state == state.localState ? s.localState : CodeMirror.copyState(pers.mode, pers.state),
+                                next: s.persistentStates};
+        return s;
+      },
+      token: tokenFunction(states_, config),
+      innerMode: function(state) { return state.local && {mode: state.local.mode, state: state.localState}; },
+      indent: indentFunction(states_, meta)
+    };
+    if (meta) for (var prop in meta) if (meta.hasOwnProperty(prop))
+      mode[prop] = meta[prop];
+    return mode;
+  };
+
+  function ensureState(states, name) {
+    if (!states.hasOwnProperty(name))
+      throw new Error("Undefined state " + name + "in simple mode");
+  }
+
+  function toRegex(val, caret) {
+    if (!val) return /(?:)/;
+    var flags = "";
+    if (val instanceof RegExp) {
+      if (val.ignoreCase) flags = "i";
+      val = val.source;
+    } else {
+      val = String(val);
+    }
+    return new RegExp((caret === false ? "" : "^") + "(?:" + val + ")", flags);
+  }
+
+  function asToken(val) {
+    if (!val) return null;
+    if (typeof val == "string") return val.replace(/\./g, " ");
+    var result = [];
+    for (var i = 0; i < val.length; i++)
+      result.push(val[i] && val[i].replace(/\./g, " "));
+    return result;
+  }
+
+  function Rule(data, states) {
+    if (data.next || data.push) ensureState(states, data.next || data.push);
+    this.regex = toRegex(data.regex);
+    this.token = asToken(data.token);
+    this.data = data;
+  }
+
+  function tokenFunction(states, config) {
+    return function(stream, state) {
+      if (state.pending) {
+        var pend = state.pending.shift();
+        if (state.pending.length == 0) state.pending = null;
+        stream.pos += pend.text.length;
+        return pend.token;
+      }
+
+      if (state.local) {
+        if (state.local.end && stream.match(state.local.end)) {
+          var tok = state.local.endToken || null;
+          state.local = state.localState = null;
+          return tok;
+        } else {
+          var tok = state.local.mode.token(stream, state.localState), m;
+          if (state.local.endScan && (m = state.local.endScan.exec(stream.current())))
+            stream.pos = stream.start + m.index;
+          return tok;
+        }
+      }
+
+      var curState = states[state.state];
+      for (var i = 0; i < curState.length; i++) {
+        var rule = curState[i];
+        var matches = (!rule.data.sol || stream.sol()) && stream.match(rule.regex);
+        if (matches) {
+          if (rule.data.next) {
+            state.state = rule.data.next;
+          } else if (rule.data.push) {
+            (state.stack || (state.stack = [])).push(state.state);
+            state.state = rule.data.push;
+          } else if (rule.data.pop && state.stack && state.stack.length) {
+            state.state = state.stack.pop();
+          }
+
+          if (rule.data.mode)
+            enterLocalMode(config, state, rule.data.mode, rule.token);
+          if (rule.data.indent)
+            state.indent.push(stream.indentation() + config.indentUnit);
+          if (rule.data.dedent)
+            state.indent.pop();
+          if (matches.length > 2) {
+            state.pending = [];
+            for (var j = 2; j < matches.length; j++)
+              if (matches[j])
+                state.pending.push({text: matches[j], token: rule.token[j - 1]});
+            stream.backUp(matches[0].length - (matches[1] ? matches[1].length : 0));
+            return rule.token[0];
+          } else if (rule.token && rule.token.join) {
+            return rule.token[0];
+          } else {
+            return rule.token;
+          }
+        }
+      }
+      stream.next();
+      return null;
+    };
+  }
+
+  function cmp(a, b) {
+    if (a === b) return true;
+    if (!a || typeof a != "object" || !b || typeof b != "object") return false;
+    var props = 0;
+    for (var prop in a) if (a.hasOwnProperty(prop)) {
+      if (!b.hasOwnProperty(prop) || !cmp(a[prop], b[prop])) return false;
+      props++;
+    }
+    for (var prop in b) if (b.hasOwnProperty(prop)) props--;
+    return props == 0;
+  }
+
+  function enterLocalMode(config, state, spec, token) {
+    var pers;
+    if (spec.persistent) for (var p = state.persistentStates; p && !pers; p = p.next)
+      if (spec.spec ? cmp(spec.spec, p.spec) : spec.mode == p.mode) pers = p;
+    var mode = pers ? pers.mode : spec.mode || CodeMirror.getMode(config, spec.spec);
+    var lState = pers ? pers.state : CodeMirror.startState(mode);
+    if (spec.persistent && !pers)
+      state.persistentStates = {mode: mode, spec: spec.spec, state: lState, next: state.persistentStates};
+
+    state.localState = lState;
+    state.local = {mode: mode,
+                   end: spec.end && toRegex(spec.end),
+                   endScan: spec.end && spec.forceEnd !== false && toRegex(spec.end, false),
+                   endToken: token && token.join ? token[token.length - 1] : token};
+  }
+
+  function indexOf(val, arr) {
+    for (var i = 0; i < arr.length; i++) if (arr[i] === val) return true;
+  }
+
+  function indentFunction(states, meta) {
+    return function(state, textAfter, line) {
+      if (state.local && state.local.mode.indent)
+        return state.local.mode.indent(state.localState, textAfter, line);
+      if (state.indent == null || state.local || meta.dontIndentStates && indexOf(state.state, meta.dontIndentStates) > -1)
+        return CodeMirror.Pass;
+
+      var pos = state.indent.length - 1, rules = states[state.state];
+      scan: for (;;) {
+        for (var i = 0; i < rules.length; i++) {
+          var rule = rules[i];
+          if (rule.data.dedent && rule.data.dedentIfLineStart !== false) {
+            var m = rule.regex.exec(textAfter);
+            if (m && m[0]) {
+              pos--;
+              if (rule.next || rule.push) rules = states[rule.next || rule.push];
+              textAfter = textAfter.slice(m[0].length);
+              continue scan;
+            }
+          }
+        }
+        break;
+      }
+      return pos < 0 ? 0 : state.indent[pos];
+    };
+  }
+});

applications/admin/static/codemirror/addon/runmode/colorize.js

@@ -1,29 +0,0 @@
-CodeMirror.colorize = (function() {
-
-  var isBlock = /^(p|li|div|h\\d|pre|blockquote|td)$/;
-
-  function textContent(node, out) {
-    if (node.nodeType == 3) return out.push(node.nodeValue);
-    for (var ch = node.firstChild; ch; ch = ch.nextSibling) {
-      textContent(ch, out);
-      if (isBlock.test(node.nodeType)) out.push("\n");
-    }
-  }
-
-  return function(collection, defaultMode) {
-    if (!collection) collection = document.body.getElementsByTagName("pre");
-
-    for (var i = 0; i < collection.length; ++i) {
-      var node = collection[i];
-      var mode = node.getAttribute("data-lang") || defaultMode;
-      if (!mode) continue;
-
-      var text = [];
-      textContent(node, text);
-      node.innerHTML = "";
-      CodeMirror.runMode(text.join(""), mode, node);
-
-      node.className += " cm-s-default";
-    }
-  };
-})();

applications/admin/static/codemirror/addon/runmode/runmode-standalone.js

@@ -1,151 +0,0 @@
-/* Just enough of CodeMirror to run runMode under node.js */
-
-window.CodeMirror = {};
-
-(function() {
-"use strict";
-
-function splitLines(string){ return string.split(/\r?\n|\r/); };
-
-function StringStream(string) {
-  this.pos = this.start = 0;
-  this.string = string;
-  this.lineStart = 0;
-}
-StringStream.prototype = {
-  eol: function() {return this.pos >= this.string.length;},
-  sol: function() {return this.pos == 0;},
-  peek: function() {return this.string.charAt(this.pos) || null;},
-  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() {return this.start - this.lineStart;},
-  indentation: function() {return 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; }
-  }
-};
-CodeMirror.StringStream = StringStream;
-
-CodeMirror.startState = function (mode, a1, a2) {
-  return mode.startState ? mode.startState(a1, a2) : true;
-};
-
-var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-CodeMirror.defineMode = function (name, mode) { modes[name] = mode; };
-CodeMirror.defineMIME = function (mime, spec) { mimeModes[mime] = spec; };
-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)) {
-    spec = mimeModes[spec.name];
-  }
-  if (typeof spec == "string") return {name: spec};
-  else return spec || {name: "null"};
-};
-CodeMirror.getMode = function (options, spec) {
-  spec = CodeMirror.resolveMode(spec);
-  var mfactory = modes[spec.name];
-  if (!mfactory) throw new Error("Unknown mode: " + spec);
-  return mfactory(options, spec);
-};
-CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min;
-CodeMirror.defineMode("null", function() {
-  return {token: function(stream) {stream.skipToEnd();}};
-});
-CodeMirror.defineMIME("text/plain", "null");
-
-CodeMirror.runMode = function (string, modespec, callback, options) {
-  var mode = CodeMirror.getMode({ indentUnit: 2 }, modespec);
-
-  if (callback.nodeType == 1) {
-    var tabSize = (options && options.tabSize) || 4;
-    var node = callback, col = 0;
-    node.innerHTML = "";
-    callback = function (text, style) {
-      if (text == "\n") {
-        node.appendChild(document.createElement("br"));
-        col = 0;
-        return;
-      }
-      var content = "";
-      // replace tabs
-      for (var pos = 0; ;) {
-        var idx = text.indexOf("\t", pos);
-        if (idx == -1) {
-          content += text.slice(pos);
-          col += text.length - pos;
-          break;
-        } else {
-          col += idx - pos;
-          content += text.slice(pos, idx);
-          var size = tabSize - col % tabSize;
-          col += size;
-          for (var i = 0; i < size; ++i) content += " ";
-          pos = idx + 1;
-        }
-      }
-
-      if (style) {
-        var sp = node.appendChild(document.createElement("span"));
-        sp.className = "cm-" + style.replace(/ +/g, " cm-");
-        sp.appendChild(document.createTextNode(content));
-      } else {
-        node.appendChild(document.createTextNode(content));
-      }
-    };
-  }
-
-  var lines = splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
-    if (i) callback("\n");
-    var stream = new CodeMirror.StringStream(lines[i]);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
-})();