R-2.14.1

Merge pull request #1246 from BuhtigithuB/improve-test-validators
Improve PEP8 just a bit + more coverage
2016-03-24 12:20:58 -05:00 · 2016-03-24 12:10:17 -05:00 · 2016-03-24 12:10:01 -05:00 · 2016-03-24 12:09:36 -05:00 · 2016-03-24 12:08:43 -05:00 · 2016-03-24 10:44:37 -04:00
648 changed files with 50574 additions and 68630 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,8 @@ applications/*/errors/*
 applications/*/cache/*
 applications/*/uploads/*
 applications/*/*.py[oc]
+applications/*/static/temp
+applications/*/progress.log
 applications/examples/static/epydoc
 applications/examples/static/sphinx
 applications/admin/cron/cron.master
@@ -56,3 +58,5 @@ HOWTO-web2py-devel
 *.sublime-project
 *.sublime-workspace
 .idea/*
+site-packages/
+logs/
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "gluon/packages/dal"]
+	path = gluon/packages/dal
+	url = https://github.com/web2py/pydal.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,37 @@
 language: python

+sudo: false
+
+cache:
+  directories:
+    - $HOME/.pip-cache/
+
 python:
-  - '2.5'
  - '2.6'
  - '2.7'
  - 'pypy'
+
 install:
  - pip install -e .
-env:
-  - DB=sqlite:memory
-  - DB=mysql://root:@localhost/test_w2p
-  - DB=postgres://postgres:@localhost/test_w2p
+
 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
-  #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
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --download-cache $HOME/.pip-cache unittest2; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --download-cache $HOME/.pip-cache coverage; fi;
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --download-cache $HOME/.pip-cache codecov; fi
+  - 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
-  
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then codecov; fi
+
 notifications:
  email: true
+
+addons:
+  postgresql: "9.4"
--- a/185
+++ b/185
@@ -1,4 +1,187 @@
-## 2.7.1 - 2.7.2
+## 2.14.1
+
+
+- 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. The old syntax still works but we recommend moving to 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)
+
+
+## 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
+- jquery 1.11
+- codemirror 3.21, thanks Paolo Valleri
+- fixed security issue with sessions in database, thanks Nathan Humphreys
+- fixed security issue with persistant data in session, thanks Kiran
+- fixed security issue with redirect after expired login, thanks André Kablu
+- cleaner DAL and rname integration, thanks niphlod and Michele
+- added mongodb and imap tests for dal, thanks Alan
+- NoSQL dal tests, thanks Alan
+- better docstrings, thanks Niphlod
+- allow URL(...,language=...) with parametric router, thanks Jonathan
+- allow non-expiration of gae-memcache, thanks crimsoncantab
+- MARKMIN(...,_class='...'), thanks Luca
+- better transliteration in building slugs
+- autolink emails
+- new Janrain API, thanks PeterQ2
+- enable admin app for GAE (experimental), thanks Alan
+- many bug fixes
+- invalidate function in web2py.js, thanks Paolo
+- DAL(...,adapter_args=dict(engine='MyISAM'))
+- todolist panel in admin editor, thanks Paolo Valleri
+
+## 2.8.1
+
+- no more winservice (use nssm instead)
+- better imap support in DAL
+- db().select().as_tree()
+- bootstrap 2.3.2
+- codemirror 3.19
+- improved  mongoDB support, thanks Alan
+- support for wiki custom render function
+- Wiki(...groups=['x','y']) allows bypassing default permissions
+- fixed websocket_messaging.py to support newer Tornado
+- NDB support for GAE, thanks Quint
+- fixed major concurrecy issue with MEMDB
+- blocked generic.jsonp for security reasons
+- many bug fixes, thanks Niphlod, Michele, Anthony, Tim, and many others.
+
+## 2.7.1 - 2.7.4

 - jQuery 1.10.2
 - codemirror 3.18, thanks Paolo
--- a/62
+++ b/62
@@ -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.7.3-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.14.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/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 .
--- a/README.markdown
+++ b/README.markdown
@@ -6,12 +6,42 @@ 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
--- a/2
+++ b/2
@@ -1 +1 @@
-Version 2.7.3-stable+timestamp.2013.10.11.18.10.01
+Version 2.14.1-stable+timestamp.2016.03.24.12.19.17
--- a/anyserver.py
+++ b/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):
    """
--- a/applications/admin/controllers/appadmin.py
+++ b/applications/admin/controllers/appadmin.py
@@ -16,6 +16,8 @@ try:
 except ImportError:
    pgv = None

+is_gae = request.env.web2py_runtime_gae or False
+
 # ## critical --- make a copy of the environment

 global_env = copy.copy(globals())
@@ -30,7 +32,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'):
@@ -47,7 +49,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)):
@@ -78,7 +81,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:
@@ -87,10 +89,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']
@@ -103,7 +103,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:
@@ -186,6 +185,10 @@ def select():
    import re
    db = get_database(request)
    dbname = request.args[0]
+    try:
+        is_imap = db._uri.startswith("imap://")
+    except (KeyError, AttributeError, TypeError):
+        is_imap = False
    regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
    if len(request.args) > 1 and hasattr(db[request.args[1]], '_primarykey'):
        regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
@@ -203,7 +206,15 @@ def select():
    else:
        start = 0
    nrows = 0
-    stop = start + 100
+
+    step = 100
+    fields = []
+
+    if is_imap:
+        step = 3
+ 
+    stop = start + step
+
    table = None
    rows = []
    orderby = request.vars.orderby
@@ -235,21 +246,27 @@ def select():
        if match:
            table = match.group('table')
        try:
-            nrows = db(query).count()
+            nrows = db(query, ignore_common_filters=True).count()
            if form.vars.update_check and form.vars.update_fields:
-                db(query).update(**eval_in_global_env('dict(%s)'
-                                                      % form.vars.update_fields))
+                db(query, ignore_common_filters=True).update(
+                    **eval_in_global_env('dict(%s)' % form.vars.update_fields))
                response.flash = T('%s %%{row} updated', nrows)
            elif form.vars.delete_check:
-                db(query).delete()
+                db(query, ignore_common_filters=True).delete()
                response.flash = T('%s %%{row} deleted', nrows)
-            nrows = db(query).count()
+            nrows = db(query, ignore_common_filters=True).count()
+
+            if is_imap:
+                fields = [db[table][name] for name in
+                    ("id", "uid", "created", "to",
+                     "sender", "subject")]
            if orderby:
-                rows = db(query, ignore_common_filters=True).select(limitby=(
-                    start, stop), orderby=eval_in_global_env(orderby))
+                rows = db(query, ignore_common_filters=True).select(
+                              *fields, limitby=(start, stop),
+                              orderby=eval_in_global_env(orderby))
            else:
                rows = db(query, ignore_common_filters=True).select(
-                    limitby=(start, stop))
+                    *fields, limitby=(start, stop))
        except Exception, e:
            import traceback
            tb = traceback.format_exc()
@@ -278,11 +295,12 @@ def select():
        table=table,
        start=start,
        stop=stop,
+        step=step,
        nrows=nrows,
        rows=rows,
        query=request.vars.query,
        formcsv=formcsv,
-        tb=tb,
+        tb=tb
    )


@@ -340,36 +358,43 @@ def state():


 def ccache():
-    cache.ram.initialize()
-    cache.disk.initialize()
+    if is_gae:
+        form = FORM(
+            P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")))
+    else:
+        cache.ram.initialize()
+        cache.disk.initialize()

-    form = FORM(
-        P(TAG.BUTTON(
-            T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
-        P(TAG.BUTTON(
-            T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
-        P(TAG.BUTTON(
-            T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
-    )
+        form = FORM(
+            P(TAG.BUTTON(
+                T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+            P(TAG.BUTTON(
+                T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+            P(TAG.BUTTON(
+                T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+        )

    if form.accepts(request.vars, session):
-        clear_ram = False
-        clear_disk = False
        session.flash = ""
-        if request.vars.yes:
-            clear_ram = clear_disk = True
-        if request.vars.ram:
-            clear_ram = True
-        if request.vars.disk:
-            clear_disk = True
-
-        if clear_ram:
-            cache.ram.clear()
-            session.flash += T("Ram Cleared")
-        if clear_disk:
-            cache.disk.clear()
-            session.flash += T("Disk Cleared")
-
+        if is_gae:
+            if request.vars.yes:
+                cache.ram.clear()
+                session.flash += T("Cache Cleared")
+        else:
+            clear_ram = False
+            clear_disk = False
+            if request.vars.yes:
+                clear_ram = clear_disk = True
+            if request.vars.ram:
+                clear_ram = True
+            if request.vars.disk:
+                clear_disk = True
+            if clear_ram:
+                cache.ram.clear()
+                session.flash += T("Ram Cleared")
+            if clear_disk:
+                cache.disk.clear()
+                session.flash += T("Disk Cleared")
        redirect(URL(r=request))

    try:
@@ -395,6 +420,7 @@ def ccache():
        'oldest': time.time(),
        'keys': []
    }
+    
    disk = copy.copy(ram)
    total = copy.copy(ram)
    disk['keys'] = []
@@ -409,15 +435,26 @@ def ccache():

        return (hours, minutes, seconds)

-    for key, value in cache.ram.storage.iteritems():
-        if isinstance(value, dict):
-            ram['hits'] = value['hit_total'] - value['misses']
-            ram['misses'] = value['misses']
-            try:
-                ram['ratio'] = ram['hits'] * 100 / value['hit_total']
-            except (KeyError, ZeroDivisionError):
-                ram['ratio'] = 0
-        else:
+    if is_gae:
+        gae_stats = cache.ram.client.get_stats()
+        try:
+            gae_stats['ratio'] = ((gae_stats['hits'] * 100) /
+                (gae_stats['hits'] + gae_stats['misses']))
+        except ZeroDivisionError:
+            gae_stats['ratio'] = T("?")
+        gae_stats['oldest'] = GetInHMS(time.time() - gae_stats['oldest_item_age'])
+        total.update(gae_stats)
+    else:
+        # 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 cache.ram.storage.iteritems():
            if hp:
                ram['bytes'] += hp.iso(value[1]).size
                ram['objects'] += hp.iso(value[1]).count
@@ -425,20 +462,14 @@ def ccache():
            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']
+
+        for key in cache.disk.storage:
+            value = cache.disk.storage[key]
+            if isinstance(value[1], dict):
+                disk['hits'] = value[1]['hit_total'] - value[1]['misses']
+                disk['misses'] = value[1]['misses']
                try:
-                    disk['ratio'] = disk['hits'] * 100 / value['hit_total']
+                    disk['ratio'] = disk['hits'] * 100 / value[1]['hit_total']
                except (KeyError, ZeroDivisionError):
                    disk['ratio'] = 0
            else:
@@ -450,31 +481,26 @@ def ccache():
                    disk['oldest'] = value[0]
                disk['keys'].append((key, GetInHMS(time.time() - value[0])))

-    finally:
-        portalocker.unlock(locker)
-        locker.close()
-        disk_storage.close()
+        ram_keys = ram.keys() # ['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'] +
+        try:
+            total['ratio'] = total['hits'] * 100 / (total['hits'] +
                                                total['misses'])
-    except (KeyError, ZeroDivisionError):
-        total['ratio'] = 0
+        except (KeyError, ZeroDivisionError):
+            total['ratio'] = 0

-    if disk['oldest'] < ram['oldest']:
-        total['oldest'] = disk['oldest']
-    else:
-        total['oldest'] = ram['oldest']
+        if disk['oldest'] < ram['oldest']:
+            total['oldest'] = disk['oldest']
+        else:
+            total['oldest'] = ram['oldest']

-    ram['oldest'] = GetInHMS(time.time() - ram['oldest'])
-    disk['oldest'] = GetInHMS(time.time() - disk['oldest'])
-    total['oldest'] = GetInHMS(time.time() - total['oldest'])
+        ram['oldest'] = GetInHMS(time.time() - ram['oldest'])
+        disk['oldest'] = GetInHMS(time.time() - disk['oldest'])
+        total['oldest'] = GetInHMS(time.time() - total['oldest'])

    def key_table(keys):
        return TABLE(
@@ -483,9 +509,10 @@ def ccache():
            **dict(_class='cache-keys',
                   _style="border-collapse: separate; border-spacing: .5em;"))

-    ram['keys'] = key_table(ram['keys'])
-    disk['keys'] = key_table(disk['keys'])
-    total['keys'] = key_table(total['keys'])
+    if not is_gae:
+        ram['keys'] = key_table(ram['keys'])
+        disk['keys'] = key_table(disk['keys'])
+        total['keys'] = key_table(total['keys'])

    return dict(form=form, total=total,
                ram=ram, disk=disk, object_stats=hp != False)
@@ -546,14 +573,12 @@ def bg_graph_model():
        if hasattr(db[tablename],'_meta_graphmodel'):
            meta_graphmodel = db[tablename]._meta_graphmodel
        else:
-            meta_graphmodel = dict(group='Undefined', color='#ECECEC')
+            meta_graphmodel = dict(group=request.application, color='#ECECEC')

        group = meta_graphmodel['group'].replace(' ', '')
-        if not subgraphs.has_key(group):
+        if group not in subgraphs:
            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
-            subgraphs[group]['tables'].append(tablename)
-        else:
-            subgraphs[group]['tables'].append(tablename)
+        subgraphs[group]['tables'].append(tablename)

        graph.add_node(tablename, name=tablename, shape='plaintext',
                       label=table_template(tablename))
@@ -577,8 +602,8 @@ def bg_graph_model():
                graph.add_edge(n1, n2, color="#4C4C4C", label='')

    graph.layout()
-    #return graph.draw(format='png', prog='dot')
    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)
@@ -631,3 +656,46 @@ 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
--- a/applications/admin/controllers/debug.py
+++ b/applications/admin/controllers/debug.py
@@ -54,9 +54,13 @@ def interact():
    filename = web_debugger.filename
    lineno = web_debugger.lineno
    if filename:
+        # prevent IOError 2 on some circuntances (EAFP instead of os.access)
+        try:
+            lines = open(filename).readlines()
+        except:
+            lines = ""
        lines = dict([(i + 1, l) for (i, l) in enumerate(
-            [l.strip("\n").strip("\r") for l
-             in open(filename).readlines()])])
+            [l.strip("\n").strip("\r") for l in lines])])
        filename = os.path.basename(filename)
    else:
        lines = {}
@@ -68,8 +72,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 = {}
@@ -217,7 +220,7 @@ 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)
@@ -232,5 +235,4 @@ def list_breakpoints():
        ok = True
    except Exception, e:
        session.flash = str(e)
-        ok = False
    return response.json({'ok': ok, 'breakpoints': breakpoints})
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -1,6 +1,7 @@
-# coding: utf8
+# -*- coding: utf-8 -*-

 EXPERIMENTAL_STUFF = True
+MAXNFILES = 1000

 if EXPERIMENTAL_STUFF:
    if is_mobile:
@@ -12,6 +13,7 @@ from gluon.admin import *
 from gluon.fileutils import abspath, read_file, write_file
 from gluon.utils import web2py_uuid
 from gluon.tools import Config
+from gluon.compileapp import find_exposed_functions
 from glob import glob
 import shutil
 import platform
@@ -29,10 +31,18 @@ from gluon.languages import (read_possible_languages, read_dict, write_dict,
                             read_plural_dict, write_plural_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']:
+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']:
    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'):
+    session.flash = T('disabled in GAE mode')
+    redirect(URL('site'))

 if not is_manager() and request.function in ['change_password', 'upgrade_web2py']:
    session.flash = T('disabled in multi user mode')
@@ -62,10 +72,12 @@ def log_progress(app, mode='EDIT', filename=None, progress=0):


 def safe_open(a, b):
-    if DEMO_MODE and ('w' in b or 'a' in 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)

@@ -230,7 +242,7 @@ def site():
            redirect(URL('design', args=appname))
        else:
            session.flash = \
-                DIV(T('unable to create application "%s"' % appname),
+                DIV(T('unable to create application "%s"', appname),
                    PRE(error))
        redirect(URL(r=request))

@@ -256,7 +268,7 @@ def site():
                    raise Exception("404 file not found")
            except Exception, 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

@@ -280,9 +292,6 @@ 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))
        else:
            msg = 'unable to install application "%(appname)s"'
            session.flash = T(msg, dict(appname=form_update.vars.name))
@@ -341,7 +350,7 @@ def pack():
        response.headers['Content-Disposition'] = disposition
        return safe_read(filename, 'rb')
    else:
-        session.flash = T('internal error: %s' % e)
+        session.flash = T('internal error: %s', e)
        redirect(URL('site'))

 def pack_plugin():
@@ -358,25 +367,56 @@ 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
+    from cStringIO import StringIO
+    # Download latest web2py_win and open it with zipfile
+    download_url = 'http://www.web2py.com/examples/static/web2py_win.zip'
+    out = StringIO()
+    out.write(urllib.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')
+        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, 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:
-            session.flash = T('internal error: %s' % e)
-            redirect(URL(args=request.args))
+            return pack_exe(app, base, files)
    def ignore(fs):
        return [f for f in fs if not (
                f[:1] in '#' or f.endswith('~') or f.endswith('.bak'))]
@@ -444,9 +484,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))
@@ -563,36 +609,30 @@ def edit():
    # Load json only if it is ajax edited...
    app = get_app(request.vars.app)
    app_path = apath(app, r=request)
-    editor_defaults={'theme':'web2py', 'editor': 'default'}
+    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=editor_defaults)
-    preferences = config.read()
+                    section='editor', default_values={})
+    preferences.update(config.read())

-    if not(request.ajax):
+    if not(request.ajax) and not(is_mobile):
        # return the scaffolding, the rest will be through ajax requests
        response.title = T('Editing %s') % app
-        editarea_preferences = {}
-        editarea_preferences['FONT_SIZE'] = '10'
-        editarea_preferences['FULL_SCREEN'] = 'false'
-        editarea_preferences['ALLOW_TOGGLE'] = 'true'
-        editarea_preferences['REPLACE_TAB_BY_SPACES'] = '4'
-        editarea_preferences['DISPLAY'] = 'onload'
-        for key in editarea_preferences:
-            if key in globals():
-                editarea_preferences[key] = globals()[key]
-        return response.render ('default/edit.html', dict(app=request.args[0], editor_settings=preferences, editarea_preferences=editarea_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 config.save(request.post_vars.items()):
+            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 ]
+            if config.save(post_vars):
                response.headers["web2py-component-flash"] = T('Preferences saved correctly')
            else:
                response.headers["web2py-component-flash"] = T('Preferences saved on session only')
-            response.headers["web2py-component-command"] = "update_theme('%s');update_editor('%s');jQuery('a[href=#editor_settings] button.close').click();" % (config.read()['theme'], config.read()['editor'])
+            response.headers["web2py-component-command"] = "update_editor(%s);$('a[href=#editor_settings] button.close').click();" % response.json(config.read())
            return
        else:
-            details = {'filename':'settings', 'id':'editor_settings', 'force': False}
+            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)

@@ -600,7 +640,7 @@ def edit():
    # Load json only if it is ajax edited...
    app = get_app(request.vars.app)
    filename = '/'.join(request.args)
-    response.title = request.args[-1]
+    realfilename = request.args[-1]
    if request.vars.app:
        path = abspath(filename)
    else:
@@ -615,7 +655,7 @@ def edit():
    elif filename[-4:] == '.css':
        filetype = 'css'
    elif filename[-3:] == '.js':
-        filetype = 'js'
+        filetype = 'javascript'
    else:
        filetype = 'html'

@@ -700,7 +740,7 @@ 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:
@@ -711,7 +751,7 @@ def edit():
                               % (request.args[0], mopath)])
        except Exception, 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
@@ -738,7 +778,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],
@@ -747,7 +787,8 @@ def edit():

    if len(request.args) > 2 and request.args[1] == 'controllers':
        controller = (request.args[2])[:-3]
-        functions = regex_expose.findall(data)
+        functions = find_exposed_functions(data)
+        functions = functions and sorted(functions) or []
    else:
        (controller, functions) = (None, None)

@@ -755,7 +796,10 @@ 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,
@@ -766,11 +810,61 @@ def edit():
                    view_link=view_link,
                    editviewlinks=editviewlinks,
                    id=IS_SLUG()(filename)[0],
-                    force= True if (request.vars.restore or request.vars.revert) else False)
+                    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
-        return response.json(file_details)
+        if is_mobile:
+            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' ]
+    def listfiles(app, dir, regexp='.*\.py$'):
+        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
+
+    pattern = '#\s*(todo)+\s+(.*)'
+    regex = re.compile(pattern, re.IGNORECASE)
+
+    output = []
+    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:
+                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})
+            if len(matches) != 0:
+                output.append({'filename':f,'matches':matches, 'dir':d})
+
+    return {'todo':output, 'app': app}
+
+def editor_sessions():
+    config = Config(os.path.join(request.folder, 'settings.cfg'),
+                    section='editor_sessions', default_values={})
+    preferences = config.read()
+
+    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)})
+        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})

 def resolve():
    """
@@ -807,13 +901,9 @@ def resolve():

    def getclass(item):
        """ Determine item class """
-
-        if item[0] == ' ':
-            return 'normal'
-        if item[0] == '+':
-            return 'plus'
-        if item[0] == '-':
-            return 'minus'
+        operators = {' ':'normal', '+':'plus', '-':'minus'}
+        
+        return operators[item[0]]

    if request.vars:
        c = '\n'.join([item[2:].rstrip() for (i, item) in enumerate(d) if item[0]
@@ -1007,8 +1097,8 @@ def design():
    functions = {}
    for c in controllers:
        data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
-        items = regex_expose.findall(data)
-        functions[c] = items
+        items = find_exposed_functions(data)
+        functions[c] = items and sorted(items) or []

    # Get all views
    views = sorted(
@@ -1037,9 +1127,9 @@ def design():
    privates.sort()

    # Get all static files
-    MAXNFILES = 1000
-    statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*')
-    statics = [x.replace('\\', '/') for x in statics[:MAXNFILES]]
+    statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*',
+                      maxnum = MAXNFILES)
+    statics = [x.replace(os.path.sep, '/') for x in statics]
    statics.sort()

    # Get all languages
@@ -1051,11 +1141,12 @@ def design():

    #Get crontab
    cronfolder = apath('%s/cron' % app, r=request)
-    if not os.path.exists(cronfolder):
-        os.mkdir(cronfolder)
    crontab = apath('%s/cron/crontab' % app, r=request)
-    if not os.path.exists(crontab):
-        safe_write(crontab, '#crontab')
+    if not is_gae:
+        if not os.path.exists(cronfolder):
+            os.mkdir(cronfolder)
+        if not os.path.exists(crontab):
+            safe_write(crontab, '#crontab')

    plugins = []

@@ -1144,8 +1235,8 @@ def plugin():
    functions = {}
    for c in controllers:
        data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
-        items = regex_expose.findall(data)
-        functions[c] = items
+        items = find_exposed_functions(data)
+        functions[c] = items and sorted(items) or []

    # Get all views
    views = sorted(
@@ -1173,8 +1264,9 @@ def plugin():
    privates.sort()

    # Get all static files
-    statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*')
-    statics = [x.replace('\\', '/') for x in statics]
+    statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*',
+                      maxnum = MAXNFILES)
+    statics = [x.replace(os.path.sep, '/') for x in statics]
    statics.sort()

    # Get all languages
@@ -1206,7 +1298,6 @@ def plugin():
                languages=languages,
                crontab=crontab)

-
 def create_file():
    """ Create files handler """
    if request.vars and not request.vars.token == session.token:
@@ -1217,6 +1308,8 @@ def create_file():
            app = get_app(request.vars.app)
            path = abspath(request.vars.location)
        else:
+            if 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)
@@ -1230,7 +1323,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:
@@ -1271,7 +1364,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
@@ -1281,7 +1374,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/':
@@ -1321,11 +1414,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 = ''

@@ -1343,7 +1437,11 @@ def create_file():

        safe_write(full_filename, text)
        log_progress(app, 'CREATE', filename)
-        session.flash = T('file "%(filename)s" created',
+        if request.vars.dir:
+            result = T('file "%(filename)s" created',
+                          dict(filename=full_filename[len(path):]))
+        else:
+            session.flash = T('file "%(filename)s" created',
                          dict(filename=full_filename[len(path):]))
        vars = {}
        if request.vars.id:
@@ -1352,13 +1450,51 @@ def create_file():
            vars['app'] = request.vars.app
        redirect(URL('edit',
                 args=[os.path.join(request.vars.location, filename)], vars=vars))
+
    except Exception, e:
        if not isinstance(e, HTTP):
            session.flash = T('cannot create file')

-    redirect(request.vars.sender + anchor)
+    if request.vars.dir:
+        response.flash = result
+        response.headers['web2py-component-content'] = 'append'
+        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)


+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;')
+
+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': '[^\.#].*'},
+              {'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:
@@ -1404,7 +1540,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)
@@ -1418,8 +1554,11 @@ def errors():
    import hashlib

    app = get_app()
-
-    method = request.args(1) or 'new'
+    if is_gae:
+        method = 'dbold' if ('old' in
+                     (request.args(1) or '')) else 'dbnew'
+    else:
+        method = request.args(1) or 'new'
    db_ready = {}
    db_ready['status'] = get_ticket_storage(app)
    db_ready['errmessage'] = T(
@@ -1486,32 +1625,30 @@ def errors():
        for fn in tk_db(tk_table.id > 0).select():
            try:
                error = pickle.loads(fn.ticket_data)
-            except AttributeError:
+                hash = hashlib.md5(error['traceback']).hexdigest()
+
+                if hash in delete_hashes:
+                    tk_db(tk_table.id == fn.id).delete()
+                    tk_db.commit()
+                else:
+                    try:
+                        hash2error[hash]['count'] += 1
+                    except KeyError:
+                        error_lines = error['traceback'].split("\n")
+                        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:
                tk_db(tk_table.id == fn.id).delete()
                tk_db.commit()

-            hash = hashlib.md5(error['traceback']).hexdigest()
-
-            if hash in delete_hashes:
-                tk_db(tk_table.id == fn.id).delete()
-                tk_db.commit()
-            else:
-                try:
-                    hash2error['hash']['count'] += 1
-                except KeyError:
-                    error_lines = error['traceback'].split("\n")
-                    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)
-
        decorated = [(x['count'], x) for x in hash2error.values()]
-
        decorated.sort(key=operator.itemgetter(0), reverse=True)
-
-        return dict(errors=[x[1] for x in decorated], app=app, method=method)
+        return dict(errors=[x[1] for x in decorated], app=app,
+                    method=method, db_ready=db_ready)

    elif method == 'dbold':
        tk_db, tk_table = get_ticket_storage(app)
@@ -1519,16 +1656,18 @@ def errors():
            if item[:7] == 'delete_':
                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)
+        tickets_ = tk_db(tk_table.id > 0).select(tk_table.ticket_id,
+            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_])
-
-        return dict(app=app, tickets=tickets, method=method, times=times)
+        times = dict([(row.ticket_id, row.created_datetime) for
+            row in tickets_])
+        return dict(app=app, tickets=tickets, method=method,
+                    times=times, db_ready=db_ready)

    else:
        for item in request.vars:
-            # delete_all} rows doesn't contain any ticket
+            # delete_all rows doesn't contain any ticket
            # Remove anything else as requested
            if item[:7] == 'delete_' and (not item == "delete_all}"):
                os.unlink(apath('%s/errors/%s' % (app, item[7:]), r=request))
@@ -1548,6 +1687,9 @@ def get_ticket_storage(app):
    if os.path.exists(ticket_file):
        db_string = 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
+        db_string = "google:datastore"
    else:
        return False
    tickets_table = 'web2py_ticket'
@@ -1791,3 +1933,41 @@ def git_push():
            session.flash = T("Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.")
            redirect(URL('site'))
    return dict(app=app, form=form)
+
+def plugins():
+    app = request.args(0)
+    from 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()
+            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"))
+    form = SQLFORM.factory()
+    result = None
+    if form.process().accepted:
+        # get w2p plugin
+        if "web2py.plugin." in source:
+            filename = "web2py.plugin.%s.w2p" % \
+                source.split("web2py.plugin.")[-1].split(".w2p")[0]
+        else:
+            filename = "web2py.plugin.%s.w2p" % cleanpath(plugin)
+        if plugin_install(app, urllib.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,]))
+    return dict(form=form, app=app, plugin=plugin, source=source)
--- a/applications/admin/controllers/pythonanywhere.py
+++ b/applications/admin/controllers/pythonanywhere.py
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+import base64
+import os
+import re
+import gzip
+import tarfile
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
+from xmlrpclib import ProtocolError
+from gluon.contrib.simplejsonrpc import ServerProxy
+
+
+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'}) 
--- a/applications/admin/controllers/shell.py
+++ b/applications/admin/controllers/shell.py
@@ -3,6 +3,7 @@ import cStringIO
 import gluon.contrib.shell
 import code
 import thread
+import cgi
 from gluon.shell import env

 if DEMO_MODE or MULTI_USER_MODE:
@@ -40,7 +41,7 @@ def callback():
    k = len(session['commands:' + app]) - 1
    #output = PRE(output)
    #return TABLE(TR('In[%i]:'%k,PRE(command)),TR('Out[%i]:'%k,output))
-    return 'In [%i] : %s%s\n' % (k + 1, command, output)
+    return cgi.escape('In [%i] : %s%s\n' % (k + 1, command, output))


 def reset():
--- a/applications/admin/languages/af.py
+++ b/applications/admin/languages/af.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'af',
 '!langname!': 'Afrikaanse',
--- a/applications/admin/languages/bg.py
+++ b/applications/admin/languages/bg.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'bg',
 '!langname!': 'Български',
--- a/applications/admin/languages/cs.py
+++ b/applications/admin/languages/cs.py
--- a/applications/admin/languages/de.py
+++ b/applications/admin/languages/de.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'de',
 '!langname!': 'Deutsch',
@@ -7,17 +7,18 @@
 '%s %%{row} updated': '%s %%{row} Zeilen aktualisiert',
 '%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)',
+'@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',
+'Additional code for your application': 'Zusätzlicher Code für Ihre Anwendung',
 'admin disabled because no admin password': 'admin ist deaktiviert, weil kein Admin-Passwort gesetzt ist',
 '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 unable to access password file': 'admin ist deaktiviert, weil kein Zugriff auf die Passwortdatei besteht',
@@ -34,43 +35,45 @@
 'Application': 'Anwendung',
 'application "%s" uninstalled': 'Anwendung "%s" deinstalliert',
 '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 is compiled and cannot be designed': 'Die Anwendung ist kompiliert und kann deswegen nicht mehr geändert werden',
+'Application name:': 'Name der Anwendung:',
+'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 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?',
 '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: 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',
+'back': 'Zurück',
+'beautify': 'Verschönern',
+'cache': 'Zwischenspeicher',
 '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 create file': 'Kann Datei nicht erstellen',
 'cannot upload file "%(filename)s"': 'Kann Datei nicht Hochladen "%(filename)s"',
 'Change admin password': 'Administrator-Passwort ändern',
+'change editor settings': 'Editoreinstellungen ändern',
 'Change Password': 'Passwort ändern',
 'change password': 'Passwort ändern',
 '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',
 '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',
@@ -81,22 +84,22 @@
 'Compile': 'kompilieren',
 'compiled application removed': 'kompilierte Anwendung gelöscht',
 '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',
+'created by': 'Erstellt von',
 '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',
@@ -111,16 +114,16 @@
 '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:',
 'Deploy': 'Installieren',
 'Deploy on Google App Engine': 'Auf Google App Engine installieren',
 'Deploy to OpenShift': 'Auf OpenShift installieren',
 'Description': 'Beschreibung',
 'design': 'design',
-'DESIGN': 'design',
+'DESIGN': 'DESIGN',
 'Design for': 'Design für',
-'Detailed traceback description': 'Detailed traceback description',
+'Detailed traceback description': 'Detaillierte traceback Beschreibung',
 'direction: ltr': 'direction: ltr',
 'Disable': 'Deaktivieren',
 'docs': 'docs',
@@ -128,35 +131,39 @@
 'done!': 'fertig!',
 'Download .w2p': 'Download .w2p',
 'download layouts': 'Layouts herunterladen',
-'download plugins': 'download plugins',
+'download plugins': 'Plugins herunterladen',
 'E-mail': 'E-mail',
 'EDIT': 'BEARBEITEN',
-'Edit': 'bearbeiten',
+'Edit': 'Bearbeiten',
 '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',
+'Enable': 'Aktivieren',
 '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 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',
 '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',
 'File': 'Datei',
 'file "%(filename)s" created': 'Datei "%(filename)s" erstellt',
@@ -168,38 +175,38 @@
 'file does not exist': 'Datei existiert nicht',
 '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',
+'filter': 'Filter',
+'Find Next': 'Nächster',
+'Find Previous': 'Vorheriger',
 'First name': 'Vorname',
 'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'Funktionen ohne doctests erzeugen [passed] in Tests',
 'Get from URL:': 'Get from URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
-'Go to Matching Pair': 'gehe zum übereinstimmenden Paar',
+'Go to Matching Pair': 'Gehe zum übereinstimmenden Paar',
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Group ID': 'Gruppen ID',
 'Hello World': 'Hallo Welt',
 'Help': 'Hilfe',
-'Hide/Show Translated strings': 'Hide/Show Translated strings',
-'Home': 'Home',
+'Hide/Show Translated strings': 'Zeige/Verstecke übersetzte Strings',
+'Home': 'Startseite',
 'htmledit': 'htmledit',
 '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.',
 'Import/Export': 'Importieren/Exportieren',
 'includes': 'Einfügen',
 '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',
 'Installed applications': 'Installierte Anwendungen',
-'internal error': 'interner Fehler',
-'Internal State': 'interner Status',
+'internal error': 'Interner Fehler',
+'Internal State': 'Interner Status',
 'Invalid action': 'Ungültige Aktion',
 'Invalid email': 'Ungültige Email',
 'invalid password': 'Ungültiges Passwort',
@@ -209,6 +216,7 @@
 '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',
 'language file "%(filename)s" created/updated': 'Sprachdatei "%(filename)s" erstellt/aktualisiert',
 'Language files (static strings) updated': 'Sprachdatei (statisch Strings) aktualisiert',
 'languages': 'Sprachen',
@@ -218,16 +226,17 @@
 'Last saved on:': 'Zuletzt gespeichert am:',
 'Layout': 'Layout',
 'License for': 'Lizenz für',
+'lists by ticket': 'nach Ticket aufgelistet',
 'loading...': 'lade...',
 'locals': 'locals',
-'located in the file': 'located in Datei',
+'located in the file': 'befindet sich in der Datei',
 'Login': 'Anmelden',
 'login': 'anmelden',
 'Login to the Administrative Interface': 'An das Administrations-Interface anmelden',
-'Logout': 'abmelden',
+'Logout': 'Abmelden',
 'Lost Password': 'Passwort vergessen',
 'lost password?': 'Passwort vergessen?',
-'Main Menu': 'Menü principal',
+'Main Menu': 'Hauptmenü',
 'Manage': 'Verwalten',
 'Match Pair': 'Paare finden',
 'Menu Model': 'Menü Modell',
@@ -240,32 +249,32 @@
 'Name': 'Name',
 'new application "%s" created': 'neue Anwendung "%s" erzeugt',
 'New application wizard': 'Neue Anwendung per Assistent',
-'new plugin installed': 'new plugin installed',
+'new plugin installed': 'Neues Plugin wurde installiert',
 '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 100 rows': 'nächsten 100 Zeilen',
 'Next Edit Point': 'nächster Bearbeitungsschritt',
 'NO': 'NEIN',
 '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 package selected': 'Kein Paket ausgewählt',
+'No ticket_storage.txt found under /private folder': 'Kein ticket_storage.txt unter /private folder gefunden',
+'online designer': 'Online Designer',
+'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',
+'Overwrite installed app': 'Installierte Anwendungen überschreiben',
+'Pack all': 'Verpacke alles',
 'Pack compiled': 'Verpacke kompiliert',
 'Pack custom': 'Verpacke individuell',
 'pack plugin': 'Plugin verpacken',
 'Password': 'Passwort',
 'Peeking at file': 'Dateiansicht',
-'please wait!': 'bitte warten!',
+'please wait!': 'Bitte warten!',
 'Plugin "%s" in application': 'Plugin "%s" in Anwendung',
 'plugins': 'plugins',
 'Plugins': 'Plugins',
@@ -277,19 +286,20 @@
 'private files': 'private files',
 'Project Progress': 'Projekt Fortschritt',
 'Query:': 'Abfrage:',
+'Rapid Search': 'Schnelle Suche',
 'record': 'Datensatz',
 'record does not exist': 'Datensatz existiert nicht',
 'record id': 'Datensatz id',
 'Record ID': 'Datensatz ID',
 'register': 'Registrierung',
-'Register': 'registrieren',
+'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',
+'Replace': 'Ersetzen',
+'Replace All': 'Alle Ersetzen',
+'request': 'Anfrage',
 'Reset Password key': 'Passwortschlüssel zurücksetzen',
 'Resolve Conflict file': 'bereinige Konflikt-Datei',
 'response': 'Antwort',
@@ -298,31 +308,34 @@
 'Role': 'Rolle',
 'Rows in table': 'Zeilen in Tabelle',
 '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 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 via Ajax': 'via Ajax speichern',
 'Saved file hash:': 'Gespeicherter Datei-Hash:',
 'Select Files to Package': 'Dateien zum Paketieren wählen',
 'selected': 'ausgewählt(e)',
 'session': 'Sitzung',
 'session expired': 'Sitzung abgelaufen',
-'shell': 'shell',
+'shell': 'Shell',
 'Site': 'Seite',
 'some files could not be removed': 'einige Dateien konnten nicht gelöscht werden',
-'Start searching': 'Start searching',
+'source : filesystem': 'Quelle : Dateisystem',
+'Start searching': 'Suche beginnen',
 'Start wizard': 'Assistent starten',
 'state': 'Status',
-'Static': 'Static',
+'Static': 'Statisch',
 'static': 'statische Dateien',
 'Static files': 'statische Dateien',
 'Stylesheet': 'Stylesheet',
 'Submit': 'Submit',
 'submit': 'Absenden',
 'Sure you want to delete this object?': 'Wollen Sie das Objekt wirklich löschen?',
+'switch to : db': 'wechsel zu : db',
 'table': 'Tabelle',
 'Table name': 'Tabellen Name',
 'test': 'Test',
@@ -331,24 +344,24 @@
 '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 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',
 '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, 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 is a copy of the scaffolding application': 'Dies ist eine Kopie einer Grundgerüst-Anwendung',
@@ -359,36 +372,37 @@
 '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',
+'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',
+'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 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': 'Auswahl entfernen',
+'Uninstall': 'Deinstallieren',
+'update': 'Aktualisieren',
+'update all languages': 'Aktualisiere alle Sprachen',
 'Update:': 'Aktualisiere:',
-'upgrade web2py now': 'jetzt web2py upgraden',
+'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:',
@@ -397,15 +411,15 @@
 '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',
 'Web Framework': 'Web Framework',
-'web2py is up to date': 'web2py ist auf dem neuesten Stand',
-'web2py Recent Tweets': 'neuste Tweets von web2py',
+'web2py is up to date': 'web2py ist aktuell',
+'web2py Recent Tweets': 'Neuste Tweets von web2py',
 'Welcome %s': 'Willkommen %s',
 'Welcome to web2py': 'Willkommen zu web2py',
 'Which called the function': 'welche die Funktion aufrief',
--- a/applications/admin/languages/default.py
+++ b/applications/admin/languages/default.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'en-us',
 '!langname!': 'English (US)',
--- a/applications/admin/languages/es.py
+++ b/applications/admin/languages/es.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'es',
 '!langname!': 'Español',
@@ -9,12 +9,14 @@
 '%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")',
-'@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',
+'(version %s)': '(version %s)',
+'@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',
+'About': 'Acerca de',
 'About application': 'Acerca de la aplicación',
 'additional code for your application': 'código adicional para su aplicación',
 'Additional code for your application': 'Código adicional para su aplicación',
@@ -29,37 +31,44 @@
 'An error occured, please %s the page': 'Ha ocurrido un error, por favor %s la página',
 'and rename it (required):': 'y renombrela (requerido):',
 'and rename it:': ' y renombrelo:',
+'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 "%s" uninstalled': 'aplicación "%s" desinstalada',
 'application %(appname)s installed with md5sum: %(digest)s': 'application %(appname)s installed with md5sum: %(digest)s',
 '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:',
 '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?': '¿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: 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': 'Bases de Datos y Tablas Disponibles',
 'back': 'atrás',
-'breakpoint': 'breakpoint',
-'breakpoints': 'breakpoints',
-'browse': 'buscar',
-'cache': 'cache',
-'cache, errors and sessions cleaned': 'cache, errores y sesiones eliminados',
+'Back to the plugins list': 'Regresar a la lista de plugins',
+'breakpoint': 'punto de ruptura',
+'breakpoints': 'puntos de ruptura',
+'browse': 'navegar',
+'Cache': 'Caché',
+'cache': 'caché',
+'cache, errors and sessions cleaned': 'caché, errores y sesiones eliminados',
 'can be a git repo': 'puede ser un repositorio git',
+'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:',
@@ -71,11 +80,14 @@
 'check all': 'marcar todos',
 'Check for upgrades': 'buscar actualizaciones',
 'Check to delete': 'Marque para eliminar',
-'Checking for upgrades...': 'Buscando actulizaciones...',
-'Clean': 'limpiar',
-'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 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 to check for upgrades': 'haga clic para buscar actualizaciones',
 'click to open': 'click para abrir',
 'Client IP': 'IP del Cliente',
@@ -83,40 +95,42 @@
 'Code listing': 'Listado de código',
 'collapse/expand all': 'contraer/expandir todo',
 'commit (mercurial)': 'confirmar (mercurial)',
-'Compile': 'compilar',
+'Compile': 'Compilar',
 'compiled application removed': 'aplicación compilada removida',
 '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',
 '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': 'base de datos',
 'database %s select': 'selección en base de datos %s',
 'database administration': 'administración base de datos',
+'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:',
+'Demo': 'Demo',
 'Deploy': 'Deploy',
 'Deploy on Google App Engine': 'Instale en Google App Engine',
 'Deploy to OpenShift': 'Instale en OpenShift',
@@ -124,11 +138,14 @@
 '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',
 'Disable': 'Deshabilitar',
-'docs': 'docs',
+'DISK': 'DISCO',
+'docs': 'documentos',
+'Docs': 'Documentos',
+'Done!': 'Listo!',
 'done!': 'listo!',
 'Download': 'Descargar',
 'download files via http:': 'descargar archivos via http:',
@@ -139,37 +156,42 @@
 'Edit': 'editar',
 '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': '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',
-'Enterprise Web Framework': 'Armazón Empresarial para Internet',
+'Editing myclientapi': 'Editando myclientapi',
+'Editing myemail': 'Editando myemail',
+'Editing rbare': 'Editando rbare',
+'Editing ul': 'Editando ul',
+'Enable': 'Habilitar',
+'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.': 'Errores en el formulario, verifique por favor.',
 'Exception instance attributes': 'Atributos de la instancia de Excepción',
-'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',
 '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',
@@ -181,33 +203,42 @@
 'First name': 'Nombre',
 'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
 'Globals##debug': 'Globals',
-'graph model': 'graph model',
+'graph model': 'graficación del modelo',
 'Group ID': 'ID de Grupo',
 'Hello World': 'Hola Mundo',
 'Help': 'ayuda',
+'here': 'aquí',
 'htmledit': 'htmledit',
 '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': 'Imagen',
 'Import/Export': 'Importar/Exportar',
 'includes': 'incluye',
 'insert new': 'inserte nuevo',
 'insert new %s': 'inserte nuevo %s',
-'inspect attributes': 'inspect attributes',
-'Install': 'instalar',
+'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 State': 'Estado Interno',
 'Invalid action': 'Acción inválida',
+'Invalid application name': 'Nombre de aplicación no válido',
 'Invalid email': 'Correo inválido',
 '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': 'Petición inválida',
 'invalid ticket': 'tiquete inválido',
 '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',
 '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',
@@ -216,6 +247,8 @@
 'Last name': 'Apellido',
 'Last saved on:': 'Guardado en:',
 'License for': 'Licencia para',
+'License:': 'Licencia:',
+'lists by ticket': 'listas por ticket',
 'loading...': 'cargando...',
 'locals': 'locals',
 'Locals##debug': 'Locals',
@@ -226,6 +259,7 @@
 'Lost Password': 'Contraseña perdida',
 'manage': 'gestionar',
 'Manage': 'Gestionar',
+'Manage Cache': 'Administrar Caché',
 'merge': 'combinar',
 'Models': 'Modelos',
 'models': 'modelos',
@@ -235,25 +269,31 @@
 'new application "%s" created': 'nueva aplicación "%s" creada',
 'New application wizard': 'Asistente para nueva aplicación',
 'new plugin installed': 'nuevo plugin instalado',
+'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 100 rows': '100 filas siguientes',
 'NO': 'NO',
 '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 ticket_storage.txt found under /private folder': 'No se encontró ticket_storage.txt en la carpeta /private',
+'online designer': 'diseñador en línea',
+'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': 'Revisión general',
 'Overwrite installed app': 'sobreescriba la aplicación instalada',
 'Pack all': 'empaquetar todo',
 'Pack compiled': 'empaquete compiladas',
@@ -263,9 +303,11 @@
 'Password': 'Contraseña',
 'password changed': 'contraseña cambiada',
 'Peeking at file': 'Visualizando archivo',
-'Please': 'Please',
+'Please': 'Por favor',
+'Plugin': 'Plugin',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" eliminado',
 'Plugin "%s" in application': 'Plugin "%s" en aplicación',
+'Plugin page': 'Página del plugin',
 'plugins': 'plugins',
 'Plugins': 'Plugins',
 'Plural-Forms:': 'Plural-Forms:',
@@ -273,66 +315,76 @@
 'previous 100 rows': '100 filas anteriores',
 'Private files': 'Archivos privados',
 'private files': 'archivos privados',
+'Project Progress': 'Progreso del  Proyecto',
 'Query:': 'Consulta:',
-'Rapid Search': 'Rapid Search',
+'RAM': 'RAM',
+'Rapid Search': 'Búsqueda rápida',
 'record': 'registro',
 'record does not exist': 'el registro no existe',
 'record id': 'id de registro',
 'Record ID': 'ID de Registro',
-'refresh': 'refresh',
-'Register': 'Registrese',
+'refresh': 'recargar',
+'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',
-'request': 'request',
+'Repository (%s)': 'Repositorio (%s)',
+'Repository: %s': 'Repositorio: %s',
+'request': 'petición',
 'Resolve Conflict file': 'archivo Resolución de Conflicto',
-'response': 'response',
+'response': 'respuesta',
 'restore': 'restaurar',
 'return': 'return',
 'revert': 'revertir',
 'Role': 'Rol',
 'Rows in table': 'Filas en la tabla',
 '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 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 via Ajax': 'Guardar vía Ajax',
 'Saved file hash:': 'Hash del archivo guardado:',
+'Screenshot %s': 'Screenshot %s',
+'Screenshots': 'Screenshots',
 'selected': 'seleccionado(s)',
-'session': 'session',
+'session': 'sesión',
 'session expired': 'sesión expirada',
 'Set Breakpoint on %s at line %s: %s': 'Establecer punto de ruptura en %s en la línea %s: %s',
 'shell': 'shell',
 'Site': 'sitio',
 'some files could not be removed': 'algunos archivos no pudieron ser removidos',
+'source : filesystem': 'fuente : sistema de archivos',
 'Start searching': 'Iniciar búsqueda',
 'Start wizard': 'Iniciar asistente',
 'state': 'estado',
-'Static': 'Static',
+'Static': 'Estáticos',
 'static': 'estáticos',
 'Static files': 'Archivos estáticos',
-'step': 'step',
-'stop': 'stop',
+'Statistics': 'Estadísticas',
+'step': 'paso',
+'stop': 'parar',
 'submit': 'enviar',
-'Submit': 'Submit',
+'Submit': 'Enviar',
+'Success!': '¡Éxito!',
 'successful': 'exitoso',
 'Sure you want to delete this object?': '¿Está seguro que desea eliminar este objeto?',
+'switch to : db': 'cambiar a : db',
 'table': 'tabla',
 'Table name': 'Nombre de la tabla',
 '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 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 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',
@@ -345,29 +397,30 @@
 'There are no static files': 'No hay archivos estáticos',
 '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 is the %(filename)s template': 'Está es la plantilla %(filename)s',
+'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.',
+'Ticket': 'Ticket',
 'Ticket ID': 'Ticket ID',
 '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': '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 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"',
@@ -392,25 +445,27 @@
 '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 ID': 'ID de Usuario',
 'variables': 'variables',
 'Version': 'Versión',
 'versioning': 'versiones',
-'Versioning': 'Versioning',
+'Versioning': 'Versiones',
 'view': 'vista',
 'Views': 'Vistas',
 'views': 'vistas',
 'Web Framework': 'Web Framework',
 '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 upgraded; please restart it': 'web2py actualizado; favor reiniciar',
 'Welcome to web2py': 'Bienvenido a web2py',
-'YES': 'SI',
-'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',
+'YES': 'SÍ',
+'Yes': 'Sí',
+'You are going to install': 'Vas a instalar',
+'You need to set up and reach a': 'Necesitas configurar y obtener un',
+'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.)',
+'You can inspect variables using the console below': 'Puedes inspeccionar las variables utilizando la terminal de abajo',
 }
--- a/applications/admin/languages/fr.py
+++ b/applications/admin/languages/fr.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'fr',
 '!langname!': 'Français',
--- a/applications/admin/languages/he.py
+++ b/applications/admin/languages/he.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'he-il',
 '!langname!': 'עברית',
--- a/applications/admin/languages/it.py
+++ b/applications/admin/languages/it.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'it',
 '!langname!': 'Italiano',
@@ -113,7 +113,9 @@
 'docs': 'docs',
 'done!': 'fatto!',
 '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 application': 'Modifica applicazione',
@@ -303,6 +305,7 @@
 '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]',
 'toggle breakpoint': 'toggle breakpoint',
+'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
 'translation strings for the application': "stringhe di traduzioni per l'applicazione",
@@ -322,7 +325,7 @@
 'unable to uninstall "%s"': 'impossibile disinstallare "%s"',
 'unable to upgrade because "%s"': 'impossibile aggiornare perché "%s"',
 'uncheck all': 'smarca tutti',
-'Uninstall': 'disinstalla',
+'Uninstall': 'Disinstalla',
 'update': 'aggiorna',
 'update all languages': 'aggiorna tutti i linguaggi',
 'Update:': 'Aggiorna:',
@@ -345,7 +348,7 @@
 'Versioning': 'Versioning',
 'View': 'Vista',
 'view': 'vista',
-'Views': 'viste',
+'Views': 'Viste',
 'views': 'viste',
 'Web Framework': 'Web Framework',
 'web2py is up to date': 'web2py è aggiornato',
--- a/applications/admin/languages/ja.py
+++ b/applications/admin/languages/ja.py
@@ -1,47 +1,86 @@
-# 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',
 '%s %%{row} deleted': '%s rows deleted',
 '%s %%{row} updated': '%s rows updated',
+'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '(requires internet access)': '(インターネットアクセスが必要)',
 '(something like "it-it")': '(例: "it-it")',
+'@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': 'アプリケーションについて',
 'Additional code for your application': 'アプリケーションに必要な追加記述',
 'Admin language': '管理画面の言語',
+'administrative interface': '管理画面',
 'Administrator Password:': '管理者パスワード:',
+'and rename it:': 'ファイル名を変更:',
+'appadmin': 'アプリ管理画面',
+'application "%s" uninstalled': '"%s"アプリケーションが削除されました',
+'application compiled': 'アプリケーションがコンパイルされました',
 'Application name:': 'アプリケーション名:',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
 '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"アプリケーションを削除してもよろしいですか？',
+'arguments': '引数',
+'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!': '注意: 実行中のアプリケーションは編集できません!',
 'Available databases and tables': '利用可能なデータベースとテーブル一覧',
+'back': '戻る',
 'Basics': '基本情報',
 'Begin': '開始',
+'cache': 'cache',
+'cannot upload file "%(filename)s"': '"%(filename)s"ファイルをアップロードできません',
 'Change admin password': '管理者パスワード変更',
+'check all': '全てを選択',
 'Check for upgrades': '更新チェック',
 'Checking for upgrades...': '更新を確認中...',
 'Clean': '一時データ削除',
 'Click row to expand traceback': '列をクリックしてトレースバックを展開',
+'code': 'コード',
+'collapse/expand all': '全て開閉する',
 'Compile': 'コンパイル',
+'compiled application removed': 'コンパイル済みのアプリケーションが削除されました',
 'Controllers': 'コントローラ',
+'controllers': 'コントローラ',
 'Count': '回数',
 'Create': '作成',
+'create file with filename:': 'ファイル名:',
+'Create/Upload': 'Create/Upload',
+'created by': '作成者',
+'crontab': 'crontab',
+'currently running': '現在実行中',
+'currently saved or': '現在保存されているデータ　または',
+'database administration': 'データベース管理',
+'db': 'db',
+'Debug': 'Debug',
+'defines tables': 'テーブル定義',
 'Delete': '削除',
+'delete all checked': '選択したデータを全て削除',
+'delete plugin': 'プラグイン削除',
 'Delete this file (you will be asked to confirm deletion)': 'ファイルの削除（確認画面が出ます）',
 'Deploy': 'デプロイ',
 'Deploy on Google App Engine': 'Google App Engineにデプロイ',
+'design': 'デザイン',
 'Detailed traceback description': '詳細なトレースバック内容',
+'details': '詳細',
+'direction: ltr': 'direction: ltr',
 'Disable': '無効',
+'docs': 'ドキュメント',
+'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 views:': 'ビューの編集:',
 'Editing file "%s"': '"%s"ファイルを編集中',
 'Enable': '有効',
 'Error': 'エラー',
@@ -50,46 +89,83 @@
 'Error ticket': 'エラーチケット',
 'Errors': 'エラー',
 'Exception instance attributes': '例外インスタンス引数',
+'exposes': '公開',
+'exposes:': '公開:',
+'extends': '継承',
 'File': 'ファイル',
+'filter': 'フィルタ',
 'Frames': 'フレーム',
 'Functions with no doctests will result in [passed] tests.': 'doctestsのない関数は自動的にテストをパスします。',
 'Generate': 'アプリ生成',
 'Get from URL:': 'URLから取得:',
+'go!': '実行!',
+'graph model': 'graph model',
 '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緑色のタイトルは全てのテスト（もし定義されていれば）をパスしたことを示します。その場合、テスト結果は表示されません。',
+'includes': 'インクルード',
+'index': 'index',
+'inspect attributes': '引数の検査',
 'Install': 'インストール',
 'Installed applications': 'アプリケーション一覧',
+'languages': '言語',
 'Languages': '言語',
 'Last saved on:': '最終保存日時:',
 'License for': 'License for',
+'loading...': 'ロードしています...',
+'locals': 'ローカル',
 'Login': 'ログイン',
 'Login to the Administrative Interface': '管理画面へログイン',
 'Logout': 'ログアウト',
+'models': 'モデル',
 'Models': 'モデル',
 'Modules': 'モジュール',
-'NO': 'いいえ',
+'modules': 'モジュール',
 'New Application Wizard': '新規アプリケーション作成ウィザード',
 'New application wizard': '新規アプリケーション作成ウィザード',
+'new plugin installed': '新しいプラグインがインストールされました',
 'New simple application': '新規アプリケーション',
+'NO': 'いいえ',
 'No databases in this application': 'このアプリケーションにはデータベースが存在しません',
+'no package selected': 'no package selected',
+'online designer': 'オンラインデザイナー',
+'or alternatively': 'or alternatively',
 'Overwrite installed app': 'アプリケーションを上書き',
 'Pack all': 'パッケージ化',
 'Pack compiled': 'コンパイルデータのパッケージ化',
+'pack plugin': 'プラグインのパッケージ化',
 'Peeking at file': 'ファイルを参照',
+'plugin "%(plugin)s" deleted': '"%(plugin)s"プラグインは削除されました',
 'Plugin "%s" in application': '"%s"プラグイン',
 'Plugins': 'プラグイン',
+'plugins': 'プラグイン',
+'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Powered by',
+'Private files': 'Private files',
+'private files': 'private files',
 'Reload routes': 'ルーティング再読み込み',
 'Remove compiled': 'コンパイルデータの削除',
+'request': 'リクエスト',
+'response': 'レスポンス',
+'restart': '最初からやり直し',
+'restore': '復元',
+'revert': '一つ前に戻す',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "このファイルのテストを実行(全てのファイルに対して実行する場合は、'テスト'というボタンを使用できます)",
 'Save': '保存',
 'Saved file hash:': '保存されたファイルハッシュ:',
+'session': 'セッション',
+'session expired': 'セッションの有効期限が切れました',
+'shell': 'shell',
 'Site': 'サイト',
+'skip to generate': 'スキップしてアプリ生成画面へ移動',
 'Sorry, could not find mercurial installed': 'インストールされているmercurialが見つかりません',
 'Start a new app': '新規アプリの作成',
 'Start wizard': 'ウィザードの開始',
+'state': 'state',
+'static': '静的ファイル',
+'Static': 'Static',
 'Static files': '静的ファイル',
 'Step': 'ステップ',
+'test': 'テスト',
 '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': 'データの表示方法, テーブルとセットの定義',
@@ -97,93 +173,34 @@
 'There are no controllers': 'コントローラがありません',
 'There are no modules': 'モジュールがありません',
 'There are no plugins': 'プラグインはありません',
+'There are no private files': 'There are no private files',
 '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': 'これらのファイルは直接参照されます, ここに画像が入ります',
 'Ticket ID': 'チケットID',
+'to  previous version.': '前のバージョンへ戻す。',
 '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:': 'ビューの編集:',
-'exposes': '公開',
-'exposes:': '公開:',
-'extends': '継承',
-'filter': 'フィルタ',
-'go!': '実行!',
-'includes': 'インクルード',
-'index': 'index',
-'inspect attributes': '引数の検査',
-'languages': '言語',
-'loading...': 'ロードしています...',
-'locals': 'ローカル',
-'models': 'モデル',
-'modules': 'モジュール',
-'new plugin installed': '新しいプラグインがインストールされました',
-'online designer': 'オンラインデザイナー',
-'pack plugin': 'プラグインのパッケージ化',
-'plugin "%(plugin)s" deleted': '"%(plugin)s"プラグインは削除されました',
-'plugins': 'プラグイン',
-'request': 'リクエスト',
-'response': 'レスポンス',
-'restart': '最初からやり直し',
-'restore': '復元',
-'revert': '一つ前に戻す',
-'session': 'セッション',
-'session expired': 'セッションの有効期限が切れました',
-'shell': 'shell',
-'skip to generate': 'スキップしてアプリ生成画面へ移動',
-'state': 'state',
-'static': '静的ファイル',
-'test': 'テスト',
-'to  previous version.': '前のバージョンへ戻す。',
 'uncheck all': '全ての選択を解除',
+'Uninstall': 'アプリ削除',
 'update all languages': '全ての言語を更新',
 'upload': 'アップロード',
+'Upload': 'Upload',
+'Upload a package:': 'パッケージをアップロード:',
+'Upload and install packed application': 'パッケージのアップロードとインストール',
 'upload file:': 'ファイルをアップロード:',
 'upload plugin file:': 'プラグインファイルをアップロード:',
 'user': 'ユーザー',
 'variables': '変数',
+'Version': 'バージョン',
+'Versioning': 'バージョン管理',
+'Views': 'ビュー',
 'views': 'ビュー',
-'web2py Recent Tweets': '最近のweb2pyTweets',
+'Web Framework': 'Web Framework',
 'web2py is up to date': 'web2pyは最新です',
+'web2py Recent Tweets': '最近のweb2pyTweets',
+'YES': 'はい',
 }
--- a/applications/admin/languages/my-mm.py
+++ b/applications/admin/languages/my-mm.py
@@ -0,0 +1,278 @@
+# -*- 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',
+'%s %%{row} deleted': '%s %%{row} ဖျက်ပြီးပြီ',
+'%s %%{row} updated': '%s %%{row} ပြင်ပြီးပြီ',
+'%s selected': '%s ခု ရွေးထားသည်',
+'%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")',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'About': 'အကြောင်း',
+'Access Control': 'အသုံးပြု ခြင်းဆိုင်ရာ ထိန်းချုပ်ရန်',
+'Additional code for your application': 'Additional code for your application',
+'Admin language': 'Admin language',
+'administrative interface': 'administrative interface',
+'Administrative Interface': 'စီမံခန့်ခွဲရာ အင်တာဖေ့စ်',
+'Administrator Password:': 'Administrator Password:',
+'Ajax Recipes': 'Ajax Recipes',
+'and rename it:': 'and rename it:',
+'appadmin is disabled because insecure channel': 'စိတ်မချရသော လမ်းကြောင်းမှ ဝင်ရောက်သဖြင့် appadmin ကို အသုံးပြု၍ မရပါ',
+'Application name:': 'Application name:',
+'are not used': 'အသုံးမပြုပါ',
+'are not used yet': 'အသုံးမပြုသေးပါ',
+'Are you sure you want to delete this object?': 'သင် ဒီအရာ ဖျက်ရန် သေချာပါသလား။',
+'Available Databases and Tables': 'အသုံးပြုနိုင်သော ဒေတာဘေစ့်များနှင့် ဇယားများ',
+'Buy this book': 'ဒီစာအုပ်ကို ဝယ်ပါ',
+'cache': 'cache',
+'Cache': 'Cache',
+'Cache Keys': 'Cache Keys',
+'can be a git repo': 'can be a git repo',
+'Cannot be empty': 'အလွတ် မဖြစ်ရပါ',
+'Change admin password': 'Change admin password',
+'Check to delete': 'ဖျက်ရန် စစ်ဆေးပါ',
+'Checking for upgrades...': 'အဆင့်မြှင့်တင်မှုများအတွက် စစ်ဆေးနေသည် ...',
+'Clean': 'ရှင်းလင်းရန်',
+'Clear CACHE?': 'CACHE ကို ရှင်းလင်းမည်မှာ ဟုတ်ပါသလား။',
+'Clear DISK': 'DISK ကို ရှင်းလင်းမည်။',
+'Clear RAM': 'RAM ကို ရှင်းလင်းမည်။',
+'Client IP': 'Client IP',
+'collapse/expand all': 'collapse/expand all',
+'Community': 'အသိုင်းအဝိုင်း',
+'Compile': 'Compile',
+'Components and Plugins': 'Components and Plugins',
+'Controller': 'ကွန်ထရိုလာ',
+'Controllers': 'ကွန်ထရိုလာများ',
+'controllers': 'controllers',
+'Copyright': 'မူပိုင်ခွင့်',
+'Create': 'ဖန်တီးရန်',
+'create file with filename:': 'create file with filename:',
+'Create/Upload': 'Create/Upload',
+'created by': 'ဖန်းတီးသူ',
+'Created By': 'ပြုလုပ်ဖန်တီးသူ',
+'Created On': 'ပြုလုပ်ဖန်တီးသည့်အချိန်',
+'crontab': 'crontab',
+'Current request': 'Current request',
+'Current response': 'Current response',
+'Current session': 'Current session',
+'currently running': 'လက်ရှိတွင် လုပ်ဆောင်နေသည်',
+'data uploaded': 'data uploaded',
+'Database': 'ဒေတာဘေစ့်',
+'Database %s select': 'Database %s select',
+'database administration': 'ဒေတာဘေ့(စ်) စီမံခန့်ခွဲခြင်း',
+'Database Administration (appadmin)': 'ဒေတာဘေစ့် စီမံခန့်ခွဲခြင်း (appadmin)',
+'db': 'db',
+'DB Model': 'DB Model',
+'Debug': 'အမှားရှာရန်',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'Delete:',
+'Demo': 'အစမ်း၊ သရုပ်ပြမှုများ',
+'Deploy': 'Deploy',
+'Deploy on Google App Engine': 'Deploy on Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deployment Recipes': 'Deployment Recipes',
+'Description': 'ဖော်ပြချက်',
+'design': 'design',
+'direction: ltr': 'direction: ltr',
+'Disable': 'ပိတ်ရန်',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cleared': 'Disk ရှင်းလင်းပြီးပြီ',
+'Documentation': 'စာရွက်စာတမ်း အထောက်အကူများ',
+"Don't know what to do?": 'ဘာလုပ်ရမည်မသိ ဖြစ်နေပါသလား။',
+'done!': 'လုပ်ငန်း ဆောင်ရွက်ပြီးပြီ!',
+'Download': 'Download',
+'Download layouts from repository': 'Download layouts from repository',
+'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'အီးမေးလ်',
+'Edit': 'ပြင်ဆင်ရန်',
+'Edit application': 'Application ကို ပြင်ရန်',
+'Edit current record': 'လက်ရှိ မှတ်တမ်းကို ပြင်ရန်',
+'Email and SMS': 'အီးမေးလ်နှင့် SMS',
+'Enable': 'ဖွင့်ရန်',
+'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
+'Errors': 'အမှားများ',
+'export as csv file': ' csv file အနေနဲ့ ထုတ်ပေးရန်',
+'exposes': 'exposes',
+'extends': 'extends',
+'FAQ': 'ဖြစ်လေ့ရှိသော ပြဿနာများ',
+'filter': 'filter',
+'First name': 'အမည်၏ ပထမဆုံး စာလုံး',
+'Forms and Validators': 'Forms and Validators',
+'Free Applications': 'အခမဲ့ Applications',
+'graph model': 'graph model',
+'Graph Model': 'Graph Model',
+'Group ID': 'Group ID',
+'Groups': 'အဖွဲ့များ',
+'Hello World': 'မင်္ဂလာပါ ကမ္ဘာကြီး။',
+'Help': 'အကူအညီ',
+'Home': 'မူလသို့',
+'How did you get here?': 'သင် ဘယ်လို ရောက်လာခဲ့သလဲ။',
+'import': 'သွင်းယူရန်',
+'Import/Export': 'သွင်းယူရန်/ထုတ်ယူရန်',
+'includes': 'includes',
+'Install': 'Install',
+'Installed applications': 'ထည့်သွင်းပြီး application များ',
+'Internal State': 'Internal State',
+'Introduction': 'မိတ်ဆက်',
+'Invalid email': 'အီးမေးလ် ဖြည့်သွင်းမှုမှားနေသည်',
+'Invalid Query': 'Invalid Query',
+'invalid request': 'invalid request',
+'Is Active': 'Is Active',
+'Key': 'Key',
+'Language': 'ဘာသာစကား',
+'languages': 'ဘာသာစကားများ',
+'Languages': 'ဘာသာစကားများ',
+'Last name': 'မျိုးနွယ်အမည်',
+'Layout': 'အပြင်အဆင်',
+'Layout Plugins': 'Layout Plugins',
+'Layouts': 'အပြင်အဆင်များ',
+'Live Chat': 'တိုက်ရိုက် ဆက်သွယ် ပြောကြားရန်',
+'Login': 'ဝင်ရောက်အသုံးပြုရန်',
+'Login to the Administrative Interface': 'Login to the Administrative Interface',
+'Logout': 'ထွက်ရန်',
+'Lost Password': 'စကားဝှက် မသိတော့ပါ',
+'Lost password?': 'စကားဝှက် မသိတော့ဘူးလား။',
+'Manage': 'စီမံခန့်ခွဲရန်',
+'Manage %(action)s': '%(action)s ကို စီမံရန်',
+'Manage Access Control': 'အသုံးပြုခြင်းဆိုင်ရာ ထိန်းချုပ်မှု စီမံခန့်ခွဲရန်',
+'Manage Cache': 'Manage Cache',
+'Memberships': 'အသင်းဝင်များ',
+'Menu Model': 'Menu Model',
+'models': 'models',
+'Models': 'Models',
+'Modified By': 'ပြင်ဆင်မွမ်းမံသူ',
+'Modified On': 'ပြင်ဆင်မွမ်းမံသည့် အချိန်',
+'Modules': 'Modules',
+'modules': 'modules',
+'My Sites': 'ကျွန်ုပ်၏ Site များ',
+'Name': 'အမည်',
+'New application wizard': 'New application wizard',
+'New Record': 'မှတ်တမ်း အသစ်',
+'new record inserted': 'မှတ်တမ်း အသစ် ဖြည့်သွင်းပြီးပြီ',
+'New simple application': 'ရိုးရိုး application အသစ်',
+'next %s rows': 'နောက်အတန်း %s တန်း',
+'No databases in this application': 'ဒီ application တွင် မည်သည့် ဒေတာဘေစ့်မှ မရှိပါ',
+'no package selected': 'no package selected',
+'Object or table name': 'Object or table name',
+'Online examples': 'အွန်လိုင်း နမူနာများ',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
+'or import from csv file': 'or import from csv file',
+'Origin': 'မူလ အစ',
+'Other Plugins': 'အခြား Plugins',
+'Other Recipes': 'အခြား Recipes',
+'Overview': 'အပေါ်ယံရှုမြင်ခြင်း',
+'Overwrite installed app': 'Overwrite installed app',
+'Pack all': 'အားလုံးကို ထုပ်ပိုးရန်',
+'Pack custom': 'ရွေးချယ်ထုပ်ပိုးရန်',
+'Password': 'စကားဝှက်',
+"Password fields don't match": 'စကားဝှက်များ ကိုက်ညီမှု မရှိပါ',
+'Permission': 'ခွင့်ပြုချက်',
+'Permissions': 'ခွင့်ပြုချက်များ',
+'please input your password again': 'ကျေးဇူးပြု၍ စကားဝှက်ကို ထပ်မံ ဖြည့်သွင်းပေးပါ',
+'Plugins': 'Plugins',
+'plugins': 'plugins',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'အားဖြည့်စွမ်းအားပေးသူ',
+'Preface': 'နိဒါန်း',
+'previous %s rows': 'previous %s rows',
+'Private files': 'Private files',
+'private files': 'private files',
+'pygraphviz library not found': 'pygraphviz library ကို မတွေ့ပါ',
+'Python': 'Python',
+'Query:': 'Query:',
+'Quick Examples': 'အမြန် အသုံးပြုနိုင်သော နမူနာများ',
+'RAM': 'RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
+'Ram Cleared': 'Ram ရှင်းလင်းပြီးပြီ',
+'Recipes': 'Recipes',
+'Record': 'မှတ်တမ်း',
+'record does not exist': 'မှတ်တမ်း မရှိပါ',
+'Record ID': 'Record ID',
+'Record id': 'Record id',
+'Register': 'မှတ်ပုံတင်ရန်',
+'Registration identifier': 'Registration identifier',
+'Registration key': 'Registration key',
+'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
+'Request reset password': 'စကားဝှက် အသစ် တောင်းဆိုရန်',
+'Reset Password key': 'Reset Password key',
+'Role': 'Role',
+'Roles': 'Roles',
+'Rows in Table': 'Rows in Table',
+'Rows selected': 'ရွေးထားသော အတန်းများ',
+"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 model as...': 'Save model as...',
+'Semantic': 'Semantic',
+'Services': 'Services',
+'shell': 'shell',
+'Site': 'Site',
+'Size of cache:': 'Size of cache:',
+'Start wizard': 'Start wizard',
+'state': 'state',
+'static': 'static',
+'Static': 'Static',
+'Statistics': 'ကိန်းဂဏန်း အချက်အလက်များ',
+'Stylesheet': 'Stylesheet',
+'submit': 'ပြုလုပ်ပါ',
+'Submit': 'Submit',
+'Support': 'အထောက်အပံ့',
+'Table': 'ဇယား',
+'test': 'test',
+'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 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',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'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 email already has an account': 'ဒီအီးမေးလ်တွင် အကောင့် ရှိပြီး ဖြစ်ပါသည်',
+'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
+'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'Traceback': 'Traceback',
+'Translation strings for the application': 'Translation strings for the application',
+'Try the mobile interface': 'Try the mobile interface',
+'Twitter': 'Twitter',
+'unable to parse csv file': 'unable to parse csv file',
+'Uninstall': 'Uninstall',
+'update all languages': 'update all languages',
+'Update:': 'Update:',
+'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',
+'Users': 'အသုံးပြုသူများ',
+'Verify Password': 'စကားဝှက်ကို အတည်ပြုပါ',
+'Version': 'Version',
+'Versioning': 'Versioning',
+'Videos': 'ဗွီဒီယိုများ',
+'View': 'ဗျူး',
+'views': 'views',
+'Views': 'ဗျူးများ',
+'Web Framework': 'Web Framework',
+'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...': 'ဆောင်ရွက်နေပါသည် ။ ။ ။',
+'You are successfully running web2py': 'သင်သည် web2py ကို အောင်မြင်စွာ လည်ပတ်မောင်းနှင်စေပါသည်။',
+'You can modify this application and adapt it to your needs': 'သင် ဒီ application ကို ပြုပြင်မွမ်းမံနိုင်ပါသည်။ ထို့အပြင် သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီစေရန် ပြုလုပ်နိုင်ပါသည်။',
+'You visited the url %s': 'သင် လည်ပတ်ခဲ့သော URL %s',
+'စကားဝှက် အသစ် တောင်းဆိုရန်': 'စကားဝှက် အသစ် တောင်းဆိုရန်',
+'မှတ်ပုံတင်ရန်': 'မှတ်ပုံတင်ရန်',
+'ဝင်ရောက်အသုံးပြုရန်': 'ဝင်ရောက်အသုံးပြုရန်',
+}
--- a/applications/admin/languages/nl.py
+++ b/applications/admin/languages/nl.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'nl',
 '!langname!': 'Nederlands',
@@ -477,5 +477,5 @@
 '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:',
 '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',
+'You can inspect variables using the console bellow': 'Je kan je variabelen inspecteren in de console hieronder',
 }
--- a/applications/admin/languages/pl.py
+++ b/applications/admin/languages/pl.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'pl',
 '!langname!': 'Polska',
--- a/applications/admin/languages/pt-br.py
+++ b/applications/admin/languages/pt-br.py
@@ -0,0 +1,348 @@
+# -*- 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',
+'%s %%{row} deleted': '%s registros apagados',
+'%s %%{row} updated': '%s registros atualizados',
+'%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")',
+'@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',
+'About': 'sobre',
+'About application': 'Sobre a aplicação',
+'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 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 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',
+'administrative interface': 'interface administrativa',
+'Administrator Password:': 'Senha de administrador:',
+'and rename it (required):': 'e renomeie (requerido):',
+'and rename it:': ' e renomeie:',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'admin desabilitado porque o canal não é seguro',
+'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',
+'Application name:': 'Nome da aplicação:',
+'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?',
+'arguments': 'argumentos',
+'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!',
+'Available databases and tables': 'Bancos de dados e tabelas disponíveis',
+'back': 'voltar',
+'Basics': 'Informações básicas',
+'Begin': 'Iniciar',
+'browse': 'navegar',
+'cache': 'cache',
+'cache, errors and sessions cleaned': 'cache, erros e sessões eliminadas',
+'can be a git repo': 'pode ser um repositório git',
+'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': 'mudar senha de administrador',
+'Change Password': 'Mudar Senha',
+'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',
+'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 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',
+'collapse/expand all': 'fechar/abrir todos',
+'commit (mercurial)': 'commit (mercurial)',
+'Compile': 'Compilar',
+'compiled application removed': 'a aplicação compilada foi removida',
+'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',
+'created by': 'criado por',
+'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': 'banco de dados',
+'database %s select': 'Select no banco de dados %s',
+'database administration': 'administração do banco de dados',
+'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:': 'Apague:',
+'Deploy': 'Publicar',
+'Deploy on Google App Engine': 'Publicar no Google App Engine',
+'Deploy to OpenShift': 'Publicar no OpenShift',
+'Description': 'Descrição',
+'design': 'projeto',
+'DESIGN': 'Projeto',
+'Design for': 'Projeto de',
+'Detailed traceback description': 'Descrição detalhada do traceback',
+'direction: ltr': 'direção: ltr',
+'Disable': 'Desabilitar',
+'done!': 'feito!',
+'Download .w2p': 'Download .w2p',
+'download layouts': 'download de layouts',
+'download plugins': 'download de plugins',
+'E-mail': 'E-mail',
+'EDIT': 'EDITAR',
+'Edit': 'Editar',
+'edit all': 'editar todos',
+'Edit application': 'Editar aplicação',
+'edit controller': 'editar controlador',
+'Edit current record': 'Editar o registro atual',
+'Edit Profile': 'Editar Perfil',
+'edit views:': 'editar visões:',
+'Editing file': 'Editando arquivo',
+'Editing file "%s"': 'Editando arquivo "%s"',
+'Editing Language file': 'Editando arquivo de idioma',
+'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 instance attributes': 'Atributos de instância da Exception',
+'export as csv file': 'exportar como arquivo CSV',
+'exposes': 'expõe',
+'extends': 'estende',
+'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 saved on %(time)s': 'arquivo salvo em %(time)s',
+'file saved on %s': 'arquivo salvo em %s',
+'filter': 'filtro',
+'First name': 'Nome',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Funções sem doctests resultarão em testes [aceitos].',
+'Generate': 'Gerar',
+'go!': 'vai!',
+'Group ID': 'ID do Grupo',
+'Hello World': 'Olá Mundo',
+'Help': 'Ajuda',
+'htmledit': 'htmledit',
+'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.',
+'Import/Export': 'Importar/Exportar',
+'includes': 'inclui',
+'insert new': 'inserir novo',
+'insert new %s': 'inserir novo %s',
+'inspect attributes': 'inspeciona atributos',
+'Install': 'instalar',
+'Installed applications': 'Aplicações instaladas',
+'internal error': 'erro interno',
+'Internal State': 'Estado Interno',
+'Invalid action': 'Ação inválida',
+'Invalid email': 'E-mail inválido',
+'invalid password': 'senha inválida',
+'Invalid Query': 'Consulta inválida',
+'invalid request': 'solicitação inválida',
+'invalid ticket': 'ticket inválido',
+'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 saved on:': 'Salvo pela última vez em:',
+'License for': 'Licença para',
+'loading...': 'carregando...',
+'locals': 'locals',
+'Login': 'Entrar',
+'login': 'início de sessão',
+'Login to the Administrative Interface': 'Entrar na interface adminitrativa',
+'Logout': 'finalizar sessão',
+'Lost Password': 'Perdi a senha',
+'Manage': 'Gerenciar',
+'manage': 'gerenciar',
+'merge': 'juntar',
+'Models': 'Modelos',
+'models': 'modelos',
+'Modules': 'Módulos',
+'modules': 'módulos',
+'Name': 'Nome',
+'new application "%s" created': 'nova aplicação "%s" criada',
+'New Application Wizard': 'Assistente para novas aplicações ',
+'New application wizard': 'Assistente para novas aplicações',
+'new plugin installed': 'novo plugin instalado',
+'New Record': 'Novo registro',
+'new record inserted': 'novo registro inserido',
+'New simple application': 'Nova aplicação básica',
+'next 100 rows': 'próximos 100 registros',
+'NO': 'NÃO',
+'No databases in this application': 'Não existem bancos de dados nesta aplicação',
+'no match': 'não encontrado',
+'no package selected': 'nenhum pacote selecionado',
+'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',
+'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',
+'Peeking at file': 'Visualizando arquivo',
+'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" apagado',
+'Plugin "%s" in application': 'Plugin "%s" na aplicação',
+'plugins': 'plugins',
+'Plugins': 'Plugins',
+'Powered by': 'Este site utiliza',
+'previous 100 rows': '100 registros anteriores',
+'Query:': 'Consulta:',
+'record': 'registro',
+'record does not exist': 'o registro não existe',
+'record id': 'id do registro',
+'Record ID': 'ID do Registro',
+'Register': 'Registrar-se',
+'Registration key': 'Chave de registro',
+'Reload routes': 'Recarregar routes',
+'Remove compiled': 'Eliminar compilados',
+'request': 'request',
+'Resolve Conflict file': 'Arquivo de resolução de conflito',
+'response': 'response',
+'restart': 'reiniciar',
+'restore': 'restaurar',
+'revert': 'reverter',
+'Role': 'Papel',
+'Rows in table': 'Registros na tabela',
+'Rows selected': 'Registros selecionados',
+'Running on %s': 'Rodando em %s',
+'save': 'salvar',
+'Saved file hash:': 'Hash do arquivo salvo:',
+'Select Files to Package': 'Selecione arquivos para empacotar',
+'selected': 'selecionado(s)',
+'session': 'session',
+'session expired': 'sessão expirada',
+'shell': 'Terminal',
+'Site': 'Site',
+'skip to generate': 'pular para a gerar a aplicação',
+'some files could not be removed': 'alguns arquivos não puderam ser removidos',
+'Start a new app': 'Inicie uma nova aplicação',
+'Start wizard': 'Iniciar assistente',
+'state': 'estado',
+'static': 'estáticos',
+'Static files': 'Arquivos estáticos',
+'Step': 'Passo',
+'Submit': 'Enviar',
+'submit': 'enviar',
+'Sure you want to delete this object?': 'Tem certeza que deseja apagar este objeto?',
+'table': 'tabela',
+'Table name': 'Nome da tabela',
+'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 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',
+'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 static files': 'Não existem arquicos estáticos',
+'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 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 is the %(filename)s template': 'Este é o template %(filename)s',
+'Ticket': 'Ticket',
+'Ticket ID': 'Número do Ticket',
+'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]',
+'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',
+'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 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 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',
+'update': 'alterar',
+'update all languages': 'alterar todos os idiomas',
+'Update:': 'Alterar:',
+'upgrade now to %s': 'Atualize agora para %s',
+'upgrade web2py now': 'atualize o web2py agora',
+'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 ID': 'ID do Usuário',
+'variables': 'variáveis',
+'Version': 'Versão',
+'versioning': 'versionamento',
+'Versioning': 'Versionamento',
+'view': 'visão',
+'Views': 'Visões',
+'views': 'visões',
+'Web Framework': 'Web Framework',
+'web2py is up to date': 'web2py está atualizado',
+'web2py Recent Tweets': 'Tweets Recentes de @web2py',
+'web2py upgraded; please restart it': 'web2py atualizado; favor reiniciar',
+'Welcome to web2py': 'Bem-vindo ao web2py',
+'YES': 'SIM',
+}
--- a/applications/admin/languages/pt.py
+++ b/applications/admin/languages/pt.py
@@ -1,319 +1,408 @@
-# coding: utf8
-{
-'!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',
-'%s %%{row} deleted': '%s registros apagados',
-'%s %%{row} updated': '%s registros atualizados',
-'(requires internet access)': '(requer acesso a internet)',
-'(something like "it-it")': '(algo como "it-it")',
-'@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!',
-'About': 'sobre',
-'About application': 'Sobre a aplicação',
-'Additional code for your application': 'Additional code for your application',
-'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',
-'Administrator Password:': 'Senha de administrador:',
-'Application name:': 'Nome da aplicação:',
-'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 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?',
-'Available databases and tables': 'Bancos de dados e tabelas disponíveis',
-'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',
-'Change admin password': 'mudar senha de administrador',
-'Check for upgrades': 'checar por atualizações',
-'Check to delete': 'Marque para apagar',
-'Checking for upgrades...': 'Buscando atualizações...',
-'Clean': 'limpar',
-'Click row to expand traceback': 'Clique em uma coluna para expandir o log do erro',
-'Client IP': 'IP do cliente',
-'Compile': 'compilar',
-'Controllers': 'Controladores',
-'Count': 'Contagem',
-'Create': 'criar',
-'Create new application using the Wizard': 'Criar nova aplicação utilizando o assistente',
-'Create new simple application': 'Crie uma nova aplicação',
-'Current request': 'Requisição atual',
-'Current response': 'Resposta atual',
-'Current session': 'Sessão atual',
-'DESIGN': 'Projeto',
-'Date and Time': 'Data e Hora',
-'Delete': 'Apague',
-'Delete:': 'Apague:',
-'Deploy': 'publicar',
-'Deploy on Google App Engine': 'Publicar no Google App Engine',
-'Description': 'Descrição',
-'Design for': 'Projeto de',
-'Detailed traceback description': 'Detailed traceback description',
-'E-mail': 'E-mail',
-'EDIT': 'EDITAR',
-'Edit': 'editar',
-'Edit Profile': 'Editar Perfil',
-'Edit application': 'Editar aplicação',
-'Edit current record': 'Editar o registro atual',
-'Editing Language file': 'Editando arquivo de linguagem',
-'Editing file': 'Editando arquivo',
-'Editing file "%s"': 'Editando arquivo "%s"',
-'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 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:',
-'export as csv file': 'exportar como arquivo CSV',
-'exposes': 'expõe',
-'extends': 'estende',
-'failed to reload module': 'Falha ao recarregar o módulo',
-'failed to reload module because:': 'falha ao recarregar o módulo por:',
-'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 saved on %(time)s': 'arquivo salvo em %(time)s',
-'file saved on %s': 'arquivo salvo em %s',
-'filter': 'filter',
-'htmledit': 'htmledit',
-'includes': 'inclui',
-'insert new': 'inserir novo',
-'insert new %s': 'inserir novo %s',
-'inspect attributes': 'inspect attributes',
-'internal error': 'erro interno',
-'invalid password': 'senha inválida',
-'invalid request': 'solicitação inválida',
-'invalid ticket': 'ticket inválido',
-'language file "%(filename)s" created/updated': 'arquivo de linguagem "%(filename)s" criado/atualizado',
-'languages': 'linguagens',
-'languages updated': 'linguagens atualizadas',
-'loading...': 'carregando...',
-'locals': 'locals',
-'login': 'inicio de sessão',
-'manage': 'gerenciar',
-'merge': 'juntar',
-'models': 'modelos',
-'modules': 'módulos',
-'new application "%s" created': 'nova aplicação "%s" criada',
-'new plugin installed': 'novo plugin instalado',
-'new record inserted': 'novo registro inserido',
-'next 100 rows': 'próximos 100 registros',
-'no match': 'não encontrado',
-'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:',
-'pack plugin': 'empacotar plugin',
-'password changed': 'senha alterada',
-'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" eliminado',
-'plugins': 'plugins',
-'previous 100 rows': '100 registros anteriores',
-'record': 'registro',
-'record does not exist': 'o registro não existe',
-'record id': 'id do registro',
-'request': 'request',
-'response': 'response',
-'restore': 'restaurar',
-'revert': 'reverter',
-'save': 'salvar',
-'selected': 'selecionado(s)',
-'session': 'session',
-'session expired': 'sessão expirada',
-'shell': 'Terminal',
-'some files could not be removed': 'alguns arquicos não puderam ser removidos',
-'state': 'estado',
-'static': 'estáticos',
-'submit': 'enviar',
-'table': 'tabela',
-'test': 'testar',
-'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 dadps, define tabelas e estruturas de dados',
-'the presentations layer, views are also known as templates': 'A camada de apresentação, As visões também são chamadas de templates',
-'these files are served without processing, your images go here': 'Estes arquivos são servidos sem processamento, suas imagens ficam aqui',
-'to  previous version.': 'para a versão anterior.',
-'translation strings for the application': 'textos traduzidos para a aplicação',
-'try': 'tente',
-'try something like': 'tente algo como',
-'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 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',
-'update': 'atualizar',
-'update all languages': 'atualizar todas as linguagens',
-'upgrade web2py now': 'atualize o web2py agora',
-'upload': 'upload',
-'upload application:': 'Fazer upload de uma aplicação:',
-'upload file:': 'Enviar arquivo:',
-'upload plugin file:': 'Enviar arquivo de plugin:',
-'variables': 'variáveis',
-'versioning': 'versionamento',
-'view': 'visão',
-'views': 'visões',
-'web2py Recent Tweets': 'Tweets Recentes de @web2py',
-'web2py is up to date': 'web2py está atualizado',
-'web2py upgraded; please restart it': 'web2py atualizado; favor reiniciar',
-}
+# -*- 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',
+'%s %%{row} deleted': '%s registros apagados',
+'%s %%{row} updated': '%s registros atualizados',
+'%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")',
+'@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',
+'About': 'sobre',
+'About application': 'Sobre a aplicação',
+'Accept Terms': 'Accept Terms',
+'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 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',
+'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',
+'administrative interface': 'interface administrativa',
+'Administrator Password:': 'Senha de administrador:',
+'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',
+'Application name:': 'Nome da aplicação:',
+'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?',
+'arguments': 'argumentos',
+'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',
+'back': 'voltar',
+'Begin': 'Begin',
+'browse': 'buscar',
+'cache': 'cache',
+'cache, errors and sessions cleaned': 'cache, erros e sessões eliminadas',
+'can be a git repo': 'can be a git repo',
+'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': 'mudar senha de administrador',
+'change editor settings': 'mudar definições do editor',
+'Change Password': 'Trocar Senha',
+'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',
+'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 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',
+'collapse/expand all': 'colapsar/expandir tudo',
+'commit (mercurial)': 'commit (mercurial)',
+'Compile': 'compilar',
+'compiled application removed': 'aplicação compilada removida',
+'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',
+'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': 'banco de dados',
+'database %s select': 'Seleção no banco de dados %s',
+'database administration': 'administração de banco de dados',
+'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:',
+'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 Interface': 'Deployment Interface',
+'Description': 'Descrição',
+'design': 'modificar',
+'DESIGN': 'Projeto',
+'Design for': 'Projeto de',
+'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
+'direction: ltr': 'direção: ltr',
+'Disable': 'Disable',
+'docs': 'docs',
+'done!': 'feito!',
+'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 application': 'Editar aplicação',
+'edit controller': 'editar controlador',
+'Edit current record': 'Editar o registro atual',
+'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',
+'Email Address': 'Email Address',
+'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 instance attributes': 'Atributos da instancia de excessão',
+'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',
+'exposes': 'expõe',
+'exposes:': 'exposes:',
+'extends': 'estende',
+'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',
+'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 saved on %(time)s': 'arquivo salvo em %(time)s',
+'file saved on %s': 'arquivo salvo em %s',
+'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].',
+'graph model': 'graph model',
+'Group ID': 'ID do Grupo',
+'Hello World': 'Olá Mundo',
+'Help': 'ajuda',
+'Hide/Show Translated strings': '',
+'htmledit': 'htmledit',
+'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/Export': 'Importar/Exportar',
+'includes': 'inclui',
+'insert new': 'inserir novo',
+'insert new %s': 'inserir novo %s',
+'inspect attributes': 'inspecionar atributos',
+'Install': 'instalar',
+'Installed applications': 'Aplicações instaladas',
+'internal error': 'erro interno',
+'Internal State': 'Estado Interno',
+'Invalid action': 'Ação inválida',
+'Invalid email': 'E-mail inválido',
+'invalid password': 'senha inválida',
+'Invalid Query': 'Consulta inválida',
+'invalid request': 'solicitação inválida',
+'invalid ticket': 'ticket inválido',
+'Keyboard shortcuts': 'Atalhos de teclado',
+'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 saved on:': 'Salvo em:',
+'License for': 'Licença para',
+'lists by ticket': 'lists by ticket',
+'Loading...': 'Loading...',
+'loading...': 'carregando...',
+'Local Apps': 'Local Apps',
+'locals': 'locals',
+'Login': 'Entrar',
+'login': 'inicio de sessão',
+'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',
+'manage': 'gerenciar',
+'Manage': 'Manage',
+'merge': 'juntar',
+'models': 'modelos',
+'Models': 'Modelos',
+'Modules': 'Módulos',
+'modules': 'módulos',
+'Name': 'Nome',
+'new application "%s" created': 'nova aplicação "%s" criada',
+'New Application Wizard': 'New Application Wizard',
+'New application wizard': 'Assistente para novas aplicações ',
+'new plugin installed': 'novo plugin instalado',
+'New Record': 'Novo registro',
+'new record inserted': 'novo registro inserido',
+'New simple application': 'Nova aplicação básica',
+'next 100 rows': 'próximos 100 registros',
+'NO': 'NÃO',
+'No databases in this application': 'Não existem bancos de dados nesta aplicação',
+'no match': 'não encontrado',
+'no package selected': 'nenhum pacote selecionado',
+'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:': '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',
+'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',
+'Peeking at file': 'Visualizando arquivo',
+'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',
+'plugins': 'plugins',
+'Plugins': 'Plugins',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Este site utiliza',
+'previous 100 rows': '100 registros anteriores',
+'Private files': 'Private files',
+'private files': 'private files',
+'PythonAnywhere Apps': 'PythonAnywhere Apps',
+'PythonAnywhere Password': 'PythonAnywhere Password',
+'Query:': 'Consulta:',
+'Rapid Search': 'Rapid Search',
+'Read': 'Read',
+'record': 'registro',
+'record does not exist': 'o registro não existe',
+'record id': 'id do registro',
+'Record ID': 'ID do Registro',
+'Register': 'Registrar-se',
+'Registration key': 'Chave de registro',
+'Reload routes': 'Reload routes',
+'Remove compiled': 'eliminar compilados',
+'Replace': 'Substituir',
+'Replace All': 'Substituir Tudo',
+'request': 'request',
+'requires python-git, but not installed': 'requires python-git, but not installed',
+'Resolve Conflict file': 'Arquivo de resolução de conflito',
+'response': 'response',
+'restore': 'restaurar',
+'revert': 'reverter',
+'Role': 'Papel',
+'Rows in table': 'Registros na tabela',
+'Rows selected': 'Registros selecionados',
+'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')",
+'Running on %s': 'A correr em %s',
+'Save': 'Save',
+'save': 'salvar',
+'Save file:': 'Gravar ficheiro:',
+'Save file: %s': 'Gravar ficheiro: %s',
+'Save via Ajax': 'Gravar via Ajax',
+'Saved file hash:': 'Hash do arquivo salvo:',
+'selected': 'selecionado(s)',
+'session': 'session',
+'session expired': 'sessão expirada',
+'shell': 'Terminal',
+'Site': 'site',
+'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',
+'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',
+'Submit': 'Submit',
+'submit': 'enviar',
+'Sure you want to delete this object?': 'Tem certeza que deseja apaagr este objeto?',
+'switch to : db': 'switch to : db',
+'table': 'tabela',
+'Table name': 'Nome da tabela',
+'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 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',
+'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, 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 is the %(filename)s template': 'Este é o template %(filename)s',
+'Ticket': 'Ticket',
+'Ticket ID': 'Ticket ID',
+'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]',
+'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',
+'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 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 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',
+'update': 'atualizar',
+'update all languages': 'atualizar todas as linguagens',
+'Update:': 'Atualizar:',
+'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 ID': 'ID do Usuario',
+'Username': 'Username',
+'variables': 'variáveis',
+'Version': 'Versão',
+'versioning': 'versionamento',
+'Versioning': 'Versioning',
+'view': 'visão',
+'Views': 'Visões',
+'views': 'visões',
+'Warning!': 'Warning!',
+'Web Framework': 'Web Framework',
+'web2py Admin Password': 'web2py Admin Password',
+'web2py is up to date': 'web2py está atualizado',
+'web2py Recent Tweets': 'Tweets Recentes de @web2py',
+'web2py upgraded; please restart it': 'web2py atualizado; favor reiniciar',
+'Welcome to web2py': 'Bem-vindo ao web2py',
+'YES': 'SIM',
+'You only need these if you have already registered': 'You only need these if you have already registered',
+}
--- a/applications/admin/languages/ro.py
+++ b/applications/admin/languages/ro.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!=': '!=',
 '!langcode!': 'ro',
--- a/applications/admin/languages/ru.py
+++ b/applications/admin/languages/ru.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'ru',
 '!langname!': 'Русский',
@@ -185,8 +185,8 @@
 'Invalid Query': 'Неверный запрос',
 'invalid request': 'неверный запрос',
 'invalid ticket': 'неверный тикет',
-'Key bindings': 'Связываник клавиш',
-'Key bindings for ZenConding Plugin': 'Связывание клавиш для плагина ZenConding',
+'Key bindings': 'Комбинации клавиш',
+'Key bindings for ZenConding Plugin': 'Комбинации клавиш для плагина ZenConding',
 'language file "%(filename)s" created/updated': 'Языковой файл "%(filename)s" создан/обновлен',
 'Language files (static strings) updated': 'Языковые файлы (статичные строки) обновлены',
 'languages': 'языки',
@@ -204,7 +204,7 @@
 'Login to the Administrative Interface': 'Вход в интерфейс администратора',
 'Logout': 'выход',
 'Lost Password': 'Забыли пароль',
-'lost password?': 'Пароль утерен?',
+'lost password?': 'Пароль утерян?',
 'Main Menu': 'Главное меню',
 'Match Pair': 'Найти пару',
 'Menu Model': 'Модель меню',
--- a/applications/admin/languages/sl.py
+++ b/applications/admin/languages/sl.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'sl',
 '!langname!': 'Slovenski',
--- a/applications/admin/languages/sr-cr.py
+++ b/applications/admin/languages/sr-cr.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'sr-cr',
 '!langname!': 'Српски (Ћирилица)',
--- a/applications/admin/languages/sr-lt.py
+++ b/applications/admin/languages/sr-lt.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'sr-lt',
 '!langname!': 'Srpski (Latinica)',
--- a/applications/admin/languages/tr.py
+++ b/applications/admin/languages/tr.py
@@ -0,0 +1,426 @@
+# 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.',
+'%s %%{row} deleted': '%s %%{row} silindi',
+'%s %%{row} updated': '%s %%{row} güncellendi',
+'%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) ',
+'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",
+'About': 'Hakkında',
+'About application': 'Uygulama hakkında',
+'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 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',
+'Admin versioning page': 'Yönetici sürümleme sayfası',
+'administrative interface': 'yönetsel arayüz',
+'Administrator Password:': 'Yönetici Parolası:',
+'and rename it (required):': 've yeniden adlandır (gerekli):',
+'and rename it:': 'yeniden adlandır:',
+'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 compiled': 'uygulama derlendi',
+'application is compiled and cannot be designed': 'uygulama derlenmiş ve tasarlanamaz',
+'Application name:': 'Uygulama adı:',
+'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?',
+'Are you sure you want to delete plugin "%s"?': '"%s" eklentisini kaldırmak istediğinizden emin misiniz?',
+'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?",
+'arguments': 'argümanlar',
+'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',
+'back': 'geri',
+'Back to wizard': 'Sihirbaza geri dön',
+'Basics': 'Temeller',
+'Begin': 'Başla',
+'breakpoint': 'kesme noktası',
+'Breakpoints': 'Kesme Noktaları',
+'breakpoints': 'kesme noktaları',
+'cache': 'zula',
+'cache, errors and sessions cleaned': 'zula, hatalar ve oturumlar temizlendi',
+'can be a git repo': 'git deposu olabilir',
+'Cancel': 'Vazgeç',
+'Cannot be empty': 'Boş olamaz',
+'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Derlenemiyor: uygulamanızda hata(lar) var. Hataları düzeltin ve tekrar deneyin.',
+'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': 'admin parolasını değiştir',
+'change editor settings': 'düzenleyici ayarlarını değiştir',
+'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',
+'Click row to expand traceback': 'Takibi genişletmek için satır üzerine tıkla',
+'click to check for upgrades': 'güncellemeleri denetlemek için tıklayın',
+'code': 'kod',
+'collapse/expand all': 'sıkıştır/tümünü aç',
+'Comment:': 'Yorum:',
+'Commit': 'Öneri',
+'Commit form': 'Tarafından öneri',
+'Compile': 'Derle',
+'compiled application removed': 'derlenmiş uygulama kaldırıldı',
+'Condition': 'Durum',
+'Controllers': 'Denetçiler',
+'controllers': 'denetçiler',
+'Count': 'Sayı',
+'Create': 'Oluştur',
+'create file with filename:': 'dosya adı ile dosya oluştur:',
+'create new application:': 'yeni uygulama oluştur:',
+'Create new simple application': 'Yeni basit uygulama oluştur',
+'Create/Upload': 'Oluştur/Yükle',
+'created by': 'yazan:',
+'crontab': 'krontab',
+'Current request': 'Şimdiki istek',
+'Current response': 'Şimdiki yanıt',
+'Current session': 'Şimdiki oturum',
+'currently running': 'şimdiki çalışan',
+'currently saved or': 'şimdiki kaydedilen veya',
+'data uploaded': 'veri yüklendi',
+'database': 'veritabı',
+'database %s select': '%s veritabanı seçildi',
+'Database administration': 'Veritabanı yönetimi',
+'database administration': 'veritabı yönetimi',
+'Date and Time': 'Tarih ve Zaman',
+'db': 'db',
+'Debug': 'Hata Ayıkla',
+'defines tables': 'tablolar tanımlı',
+'Delete': 'Sil',
+'delete': 'sil',
+'delete all checked': 'tüm kontrol edilenleri sil',
+'delete plugin': ' eklentiyi sil',
+'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',
+'Deploy': 'Yayımla',
+'Deploy on Google App Engine': 'Google App Motorunda Yayınla',
+'Deploy to OpenShift': "OpenShift'e Yayınla ",
+'Deployment form': 'Yayınlama formu',
+'design': 'tadarla',
+'Detailed traceback description': 'Ayrıntılı nedenin bulma tanımı',
+'direction: ltr': 'yön: ltr',
+'Disable': 'Devre Dışı',
+'docs': 'dokümanlar',
+'done!': 'bitti!',
+'Download .w2p': '.w2p İndir',
+'download layouts': 'düzenleri indir',
+'download plugins': 'eklentileri indir',
+'EDIT': 'DÜZENLE',
+'Edit': 'Düzenle',
+'edit all': 'tümünü düzenle',
+'Edit application': 'Uygulamayı düzenle',
+'edit controller': 'denetçiyi düzenle',
+'edit controller:': 'denetçiyi düzenle:',
+'Edit current record': 'Şimdiki kaydı düzenle',
+'edit views:': 'görünümleri düzenle:',
+'Editing %s': '%s Düzenleniyor',
+'Editing file': 'Dosya düzenleniyor',
+'Editing file "%s"': '"%s" dosyası düzenleniyor ',
+'Editing Language file': 'Dil dosyası düzenleniyor',
+'Enable': 'Etkinleştir',
+'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',
+'Enterprise Web Framework': 'Enterprise Web Çatısı',
+'Error': 'Hata',
+'Error logs for "%(app)s"': '"%(app)s" uygulaması için hata kayıtları',
+'Error snapshot': 'Hata resmi',
+'Error ticket': 'Hata bileti',
+'Errors': 'Hatalar',
+'Exception instance attributes': 'Hata durumu özellikleri',
+'Exit Fullscreen': 'Tam Ekrandan Çık',
+'Expand Abbreviation': 'Kısıtlamayı Aç',
+'export as csv file': 'CSV olarak dışa ver',
+'exposes': 'sergileniyor',
+'exposes:': 'sergile:',
+'extends': 'genişlet',
+'failed to reload module': 'modül yüklenemedi',
+'failed to reload module because:': 'modü yüklenemedi çünkü:',
+'File': 'Dosya',
+'file "%(filename)s" created': '"%(filename)s" dosyaları oluşturuldu',
+'file "%(filename)s" deleted': '"%(filename)s" dosyaları silindi',
+'file "%(filename)s" uploaded': '"%(filename)s" dosyaları yüklendi',
+'file "%s" of %s restored': '"%s" dosyasının %s kısmı geri alındı',
+'file changed on disk': 'dosya disk üzerinde değişti',
+'file does not exist': 'dosya bulunamıyor',
+'file not found': 'dosya bulanamadı',
+'file saved on %(time)s': 'dosyası %(time)s zamanında kaydedildi',
+'file saved on %s': 'dosyası kaydedildi: %s',
+'Filename': 'Dosya adı',
+'filter': 'filtre',
+'Find Next': 'Sonrakini Bul',
+'Find Previous': 'Öncekini Bul',
+'Frames': 'Çerçeveler',
+'Functions with no doctests will result in [passed] tests.': '[passed] testlerdeki işlevlerde doctest yok',
+'GAE Email': 'GAE E-postası',
+'GAE Password': 'GAE Parolası',
+'Generate': 'Oluştur',
+'Git Pull': 'Git Çek',
+'Git Push': 'Git İtele',
+'Globals##debug': 'Geneller',
+'go!': 'git!',
+'Google App Engine Deployment Interface': 'Google App Motoru Yayınlama Arayüzü',
+'Google Application Id': 'Google Uygulama Id',
+'Goto': 'Git',
+'graph model': 'grafik modeli',
+'Help': 'Yardım',
+'Hide/Show Translated strings': 'Çevrilmiş cümleleri Gizle/Görüntüle',
+'Hits': 'Vuruşlar',
+'Home': 'Anasayfa',
+'honored only if the expression evaluates to true': 'sadece deyim doğru sonucunu verirse',
+'htmledit': 'html dğzenleyici',
+'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.',
+'Import/Export': 'İçe/Dışa Aktarıcı',
+'includes': 'içerir',
+'index': 'indeks',
+'insert new': 'yeni ekle',
+'insert new %s': '%s yeni ekle',
+'inspect attributes': 'özellikleri denetleyin',
+'Install': 'Kurucu',
+'Installed applications': 'Kurulu uygulamalar',
+'internal error': 'dahili hata',
+'Internal State': 'Dahili Durum',
+'Invalid action': 'Geçersiz eylem',
+'invalid expression': 'geçersiz ifade',
+'invalid password': 'Parola geçersiz',
+'invalid password.': 'geçersiz parola.',
+'Invalid Query': 'Geçersiz Sorgu',
+'invalid request': 'geçersiz istek',
+'invalid ticket': 'geçersiz bilet',
+'Key bindings': 'Anahtarlar',
+'Key bindings for ZenCoding Plugin': 'ZenCoding Eklentisi için anahtarlar',
+'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 saved on:': 'Son kaydedilme:',
+'License for': 'için lisanslanmış',
+'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...': 'yükleniyor ...',
+'locals': 'yereller',
+'Locals##debug': 'Yereller',
+'Login': 'Giriş',
+'login': 'giriş',
+'Login to the Administrative Interface': 'Yönetsel Arayüze Giriş\t',
+'Logout': 'Çıkış',
+'Manage': 'Yönet',
+'merge': 'birleştir',
+'Models': 'Modeller',
+'models': 'modeller',
+'Modules': 'Modüller',
+'modules': 'modüller',
+'new application "%s" created': 'yeni uygulama "%s" oluşturuldu',
+'New Application Wizard': 'Yeni Uygulama Sihirbazı',
+'New application wizard': 'Yeni uygulama sihirbazı',
+'new plugin installed': 'yeni eklenti kuruldu',
+'New Record': 'Yeni Kayıt',
+'new record inserted': 'yeni kayıt eklendi',
+'New simple application': 'Yeni basit uygulama',
+'next 100 rows': 'sonraki 100 satır',
+'NO': 'HAYIR',
+'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 ticket_storage.txt found under /private folder': '/private dizininde ticket_storage.txt dosyası bulunamadı',
+'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.',
+'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ü',
+'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',
+'Overwrite installed app': 'Kurulu uygulama üzerine yaz',
+'Pack all': 'Tümünü paketle',
+'Pack compiled': 'Derlenenleri paketle',
+'Pack custom': 'Tercihli paketle',
+'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',
+'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',
+'Please': 'Lütfen',
+'plugin "%(plugin)s" deleted': '"%(plugin)s" eklentisi silindi',
+'Plugin "%s" in application': '"%s" uygulamasında eklenti',
+'plugins': 'eklentiler',
+'Plugins': 'Eklentiler',
+'Plural-Forms:': 'Çoğul-Kipler:',
+'Powered by': 'Yazılım Temeli:',
+'previous 100 rows': 'önceki 100 satır',
+'Private files': 'Özel dosyalar',
+'private files': 'özel dosyalar',
+'Project Progress': 'Proje İlerlemesi',
+'pygraphviz library not found': 'pygraphviz kütüphanesi yok',
+'Query:': 'Sorgu: ',
+'Rapid Search': 'Hızlı Arama',
+'record': 'kayıt',
+'record does not exist': 'kayıt bulunamıyor',
+'record id': 'kayıt id',
+'refresh': 'yeniden yükle',
+'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',
+'request': 'istek',
+'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',
+'revert': 'geri al',
+'Rows in table': 'Tablosundaki satırlar',
+'Rows selected': 'Seçilen satırlar',
+"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 via Ajax': 'Ajax üzerinden kaydet',
+'Saved file hash:': 'Kaydedilen dosyanın parmak izi:',
+'Select Files to Package': 'Paketlenecek Dosyaları Seç',
+'selected': 'seçildi',
+'session': 'oturum',
+'session expired': 'oturum zamanaşımına uğradı',
+'Set Breakpoint on %s at line %s: %s': "%s'nin %s satırındaki kesme noktasını: %s yap",
+'shell': 'kabuk',
+'Site': 'Site',
+'skip to generate': 'oluşturmak için atla',
+'some files could not be removed': 'bazı dosyalar kaldırılamadı',
+'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 files': 'Statik dosyalar',
+'Step': 'Basamak',
+'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',
+'table': 'tablo',
+'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 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.',
+'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, 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 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..',
+'Ticket': 'Bilet',
+'Ticket ID': 'Bile ID\'si',
+'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 Fullscreen': 'Tam Ekrana Geç',
+'Traceback': 'Nedenin bul',
+'translation strings for the application': 'uygulama için çeviri cümleleri',
+'Translation strings for the application': 'Uygulama için çeviri cümleleri',
+'try': 'dene',
+'try something like': 'gibi birşey dene',
+'Try the mobile interface': 'Mobil arayüzü dene',
+'try view': 'görünümü dene',
+'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 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 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',
+'update': 'güncelle',
+'update all languages': 'tüm delleri yükle',
+'Update:': 'Güncelle:',
+'upgrade now': 'şimdi güncelle',
+'upgrade web2py now': "web2py'yi güncelle",
+'upload': 'yükle',
+'Upload': 'Yükle',
+'Upload & install packed application': 'Paketlenmiş uygulamayı yükle ve kur',
+'Upload a package:': 'Paket yükle:',
+'Upload and install packed application': 'Paketlenmiş uygulamayı yükle ve kur',
+'upload application:': 'uygulamayı yükle:',
+'Upload existing application': 'Var olan uygulamayı yükle',
+'upload file:': 'dosyayı yükle:',
+'upload plugin file:': 'eklenti dosyasını yükle:',
+'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ı',
+'variables': 'değişkenler',
+'Version': 'Sürüm',
+'versioning': 'sürümleme',
+'Versioning': 'Sürümleme',
+'view': 'görüntü',
+'Views': 'Görüntüler',
+'views': 'görüntüler',
+'Web Framework': 'Web Çatısı',
+'web2py apps to deploy': 'Yayınlanacak web2py uygulaması',
+'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 upgraded; please restart it': 'web2py güncellendi, lütfen yeniden başlatın',
+'WSGI reference name': 'WSGI referans ismi',
+'YES': 'EVET',
+'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 need to set up and reach a': 'Gelinceye kadar kurmalısınız',
+}
--- a/applications/admin/languages/uk.py
+++ b/applications/admin/languages/uk.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'uk',
 '!langname!': 'Українська',
@@ -517,5 +517,5 @@
 'you must specify a name for the uploaded application': "ви повинні вказати ім'я додатка, перед ти, як завантажити його",
 'You need to set up and reach a': 'Треба встановити та досягнути',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Ваш додаток буде заблоковано, поки ви не клацнете по одній з кнопок керування ("наступний", "крок", "продовжити", та ін.)',
-'Your can inspect variables using the console bellow': 'Ви можете досліджувати змінні, використовуючи інтерактивну консоль',
+'You can inspect variables using the console bellow': 'Ви можете досліджувати змінні, використовуючи інтерактивну консоль',
 }
--- a/applications/admin/languages/zh-tw.py
+++ b/applications/admin/languages/zh-tw.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'zh-tw',
 '!langname!': '台灣中文',
--- a/applications/admin/languages/zh.py
+++ b/applications/admin/languages/zh.py
@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'zh-cn',
 '!langname!': '中文',
--- a/applications/admin/models/0.py
+++ b/applications/admin/models/0.py
@@ -8,42 +8,6 @@ WEB2PY_VERSION_URL = WEB2PY_URL + '/examples/default/version'
 # the user-interface feature that allows you to edit files in your web
 # browser.

-## Default editor (to change editor you need web2py.admin.editors.zip)
-## old editors like 'ace' or 'edit_area' or 'amy' are no longer supported
-TEXT_EDITOR = 'codemirror'
-
-## Editor Color scheme (only for ace)
-TEXT_EDITOR_THEME = (
-    "chrome", "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn",
-    "dreamweaver", "eclipse", "idle_fingers", "kr_theme", "merbivore",
-    "merbivore_soft", "monokai", "mono_industrial", "pastel_on_dark",
-    "solarized_dark", "solarized_light", "textmate", "tomorrow",
-    "tomorrow_night", "tomorrow_night_blue", "tomorrow_night_bright",
-    "tomorrow_night_eighties", "twilight", "vibrant_ink")[0]
-
-## Editor Keyboard bindings (only for ace and codemirror)
-TEXT_EDITOR_KEYBINDING = ''  # 'emacs' or 'vi'
-
-### edit_area only
-# The default font size, measured in 'points'. The value must be an integer > 0
-FONT_SIZE = 10
-
-# Displays the editor in full screen mode. The value must be 'true' or 'false'
-FULL_SCREEN = 'false'
-
-# Display a check box under the editor to allow the user to switch
-# between the editor and a simple
-# HTML text area. The value must be 'true' or 'false'
-ALLOW_TOGGLE = 'true'
-
-# Replaces tab characters with space characters.
-# The value can be 'false' (meaning that tabs are not replaced),
-# or an integer > 0 that specifies the number of spaces to replace a tab with.
-REPLACE_TAB_BY_SPACES = 4
-
-# Toggle on/off the code editor instead of textarea on startup
-DISPLAY = "onload" or "later"
-
 # if demo mode is True then admin works readonly and does not require login
 DEMO_MODE = False

@@ -79,3 +43,8 @@ PLUGINS_APP = 'http://web2py.com/plugins'
 # set the language
 if 'adminLanguage' in request.cookies and not (request.cookies['adminLanguage'] is None):
    T.force(request.cookies['adminLanguage'].value)
+
+#set static_version
+from gluon.settings import global_settings
+response.static_version = global_settings.web2py_version.split('-')[0]
+response.static_version_urls = True
--- a/applications/admin/models/access.py
+++ b/applications/admin/models/access.py
@@ -19,7 +19,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'))
@@ -144,7 +144,7 @@ if session.is_mobile == 'true':
 elif session.is_mobile == 'false':
    is_mobile = False
 else:
-    is_mobile = request.user_agent().is_mobile
+    is_mobile = request.user_agent().get('is_mobile',False)

 if DEMO_MODE:
    session.authorized = True
--- a/applications/admin/models/buttons.py
+++ b/applications/admin/models/buttons.py
@@ -24,7 +24,7 @@ def button_enable(href, app):
    return A(label, _class='button btn', _id=id, callback=href, target=id)

 def sp_button(href, label):
-    if request.user_agent().is_mobile:
+    if request.user_agent().get('is_mobile'):
        ret = A_button(SPAN(label), _href=href)
    else:
        ret = A(SPAN(label), _class='button special btn btn-inverse', _href=href)
@@ -37,4 +37,4 @@ def searchbox(elementid):
    return SPAN(LABEL(IMG(_id="search_start", _src=URL('static', 'images/search.png'), _alt=T('filter')),
                    _class='icon', _for=elementid), ' ',
                INPUT(_id=elementid, _type='text', _size=12, _class="input-medium"),
-            _class="searchbox")
+            _class="searchbox")
--- a/applications/admin/models/menu.py
+++ b/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')))
-
--- a/applications/admin/models/plugin_statebutton.py
+++ b/applications/admin/models/plugin_statebutton.py
@@ -0,0 +1,16 @@
+response.files.append(URL('static','plugin_statebutton/js/bootstrap-switch.js'))
+response.files.append(URL('static','plugin_statebutton/css/bootstrap-switch.css'))
+
+def stateWidget(field, value, data={'on-label':'Enabled', 'off-label':'Disabled', 'on':"primary", 'off':"default" }):
+    try:
+        fieldName = str(field).split('.')[1]
+    except:
+        fieldName = field
+
+    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)
--- a/applications/admin/settings.cfg
+++ b/applications/admin/settings.cfg
@@ -1,6 +1,10 @@
 [DEFAULT]
-theme = web2py

 [editor]
 theme = web2py
+editor = default
+closetag = true
+
+[editor_sessions]
+welcome = welcome/models/db.py,welcome/controllers/default.py,welcome/views/default/index.html

--- a/applications/admin/static/codemirror/CONTRIBUTING.md
+++ b/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.
--- a/applications/admin/static/codemirror/LICENSE
+++ b/applications/admin/static/codemirror/LICENSE
@@ -1,19 +0,0 @@
-Copyright (C) 2013 by Marijn Haverbeke <marijnh@gmail.com> and others
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--- a/applications/admin/static/codemirror/README.md
+++ b/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)
--- a/applications/admin/static/codemirror/addon/comment/comment.js
+++ b/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 = [];
@@ -96,8 +119,9 @@
      for (var i = start; i <= end; ++i) {
        var line = self.getLine(i);
        var found = line.indexOf(lineString);
+        if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1;
        if (found == -1 && (i != end || i == start) && nonWS.test(line)) break lineComment;
-        if (i != start && found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
+        if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
        lines.push(line);
      }
      self.operation(function() {
@@ -124,7 +148,21 @@
      endLine = self.getLine(--end);
      close = endLine.lastIndexOf(endString);
    }
-    if (open == -1 || close == -1) return false;
+    if (open == -1 || close == -1 ||
+        !/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) ||
+        !/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)),
@@ -142,4 +180,4 @@
    });
    return true;
  });
-})();
+});
--- a/applications/admin/static/codemirror/addon/comment/continuecomment.js
+++ b/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);
+    }
+  });
+});
--- a/applications/admin/static/codemirror/addon/dialog/dialog.js
+++ b/applications/admin/static/codemirror/addon/dialog/dialog.js
@@ -1,56 +1,99 @@
+// 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.
+      dialog.appendChild(template);
    }
-    dialog.innerHTML = template;
    return dialog;
  }

+  function closeNotification(cm, newVal) {
+    if (cm.state.currentNotificationClose)
+      cm.state.currentNotificationClose();
+    cm.state.currentNotificationClose = newVal;
+  }
+
  CodeMirror.defineExtension("openDialog", function(template, callback, options) {
-    var dialog = dialogDiv(this, template, options && options.bottom);
+    if (!options) options = {};
+
+    closeNotification(this, null);
+
+    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.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;
  });

  CodeMirror.defineExtension("openConfirm", function(template, callbacks, options) {
+    closeNotification(this, null);
    var dialog = dialogDiv(this, template, options && options.bottom);
    var buttons = dialog.getElementsByTagName("button");
    var closed = false, me = this, blurring = 1;
@@ -77,4 +120,36 @@
      CodeMirror.on(b, "focus", function() { ++blurring; });
    }
  });
-})();
+
+  /*
+   * openNotification
+   * Opens a notification, that can be closed with an optional timer
+   * (default 5000ms timer) and always closes on click.
+   *
+   * If a notification is opened while another is opened, it will close the
+   * currently opened one and open the new one immediately.
+   */
+  CodeMirror.defineExtension("openNotification", function(template, options) {
+    closeNotification(this, close);
+    var dialog = dialogDiv(this, template, options && options.bottom);
+    var closed = false, doneTimer;
+    var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000;
+
+    function close() {
+      if (closed) return;
+      closed = true;
+      clearTimeout(doneTimer);
+      dialog.parentNode.removeChild(dialog);
+    }
+
+    CodeMirror.on(dialog, 'click', function(e) {
+      CodeMirror.e_preventDefault(e);
+      close();
+    });
+
+    if (duration)
+      doneTimer = setTimeout(close, duration);
+
+    return close;
+  });
+});
--- a/applications/admin/static/codemirror/addon/display/fullscreen.js
+++ b/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) {
@@ -12,7 +22,8 @@
    var wrap = cm.getWrapperElement();
    cm.state.fullScreenRestore = {scrollTop: window.pageYOffset, scrollLeft: window.pageXOffset,
                                  width: wrap.style.width, height: wrap.style.height};
-    wrap.style.width = wrap.style.height = "";
+    wrap.style.width = "";
+    wrap.style.height = "auto";
    wrap.className += " CodeMirror-fullscreen";
    document.documentElement.style.overflow = "hidden";
    cm.refresh();
@@ -27,4 +38,4 @@
    window.scrollTo(info.scrollLeft, info.scrollTop);
    cm.refresh();
  }
-})();
+});
--- a/applications/admin/static/codemirror/addon/display/panel.js
+++ b/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();
+  }
+});
--- a/applications/admin/static/codemirror/addon/display/placeholder.js
+++ b/applications/admin/static/codemirror/addon/display/placeholder.js
@@ -1,13 +1,21 @@
-(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) {
-      cm.on("focus", onFocus);
      cm.on("blur", onBlur);
      cm.on("change", onChange);
      onChange(cm);
    } else if (!val && prev) {
-      cm.off("focus", onFocus);
      cm.off("blur", onBlur);
      cm.off("change", onChange);
      clearPlaceholder(cm);
@@ -33,9 +41,6 @@
    cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
  }

-  function onFocus(cm) {
-    clearPlaceholder(cm);
-  }
  function onBlur(cm) {
    if (isEmpty(cm)) setPlaceholder(cm);
  }
@@ -43,7 +48,6 @@
    var wrapper = cm.getWrapperElement(), empty = isEmpty(cm);
    wrapper.className = wrapper.className.replace(" CodeMirror-empty", "") + (empty ? " CodeMirror-empty" : "");

-    if (cm.hasFocus()) return;
    if (empty) setPlaceholder(cm);
    else clearPlaceholder(cm);
  }
@@ -51,4 +55,4 @@
  function isEmpty(cm) {
    return (cm.lineCount() === 1) && (cm.getLine(0) === "");
  }
-})();
+});
--- a/applications/admin/static/codemirror/addon/display/rulers.js
+++ b/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);
+  }
+});
--- a/applications/admin/static/codemirror/addon/edit/closebrackets.js
+++ b/applications/admin/static/codemirror/addon/edit/closebrackets.js
@@ -1,82 +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()) 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")
-          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) 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);
+        }
      });
    };
  }
-})();
+});
--- a/applications/admin/static/codemirror/addon/edit/closetag.js
+++ b/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,18 +25,24 @@
 * 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 (val && (old == CodeMirror.Init || !old)) {
-      var map = {name: "autoCloseTags"};
-      if (typeof val != "object" || val.whenClosing)
-        map["'/'"] = function(cm) { return autoCloseSlash(cm); };
-      if (typeof val != "object" || val.whenOpening)
-        map["'>'"] = function(cm) { return autoCloseGT(cm); };
-      cm.addKeyMap(map);
-    } else if (!val && (old != CodeMirror.Init && old)) {
+    if (old != CodeMirror.Init && old)
      cm.removeKeyMap("autoCloseTags");
-    }
+    if (!val) return;
+    var map = {name: "autoCloseTags"};
+    if (typeof val != "object" || val.whenClosing)
+      map["'/'"] = function(cm) { return autoCloseSlash(cm); };
+    if (typeof val != "object" || val.whenOpening)
+      map["'>'"] = function(cm) { return autoCloseGT(cm); };
+    cm.addKeyMap(map);
  });

  var htmlDontClose = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param",
@@ -42,46 +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) 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 (tok.type == "tag" && state.type == "closeTag" ||
-        tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
-        dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)
-      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);
-      cm.indentLine(pos.line + 2);
+      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.string.charAt(0) != "<" || inner.mode.name != "xml") 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;
+  }
+});
--- a/applications/admin/static/codemirror/addon/edit/continuelist.js
+++ b/applications/admin/static/codemirror/addon/edit/continuelist.js
@@ -1,25 +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) {
-    var pos = cm.getCursor(),
-        inList = cm.getStateAfter(pos.line).list,
-        match;
+    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;

-    if (!inList || !(match = cm.getLine(pos.line).match(listRE))) {
-      cm.execCommand('newlineAndIndent');
-      return;
+      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";
+
+      } 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);
  };
-
-}());
+});
--- a/applications/admin/static/codemirror/addon/edit/matchbrackets.js
+++ b/applications/admin/static/codemirror/addon/edit/matchbrackets.js
@@ -1,72 +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 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 + 100, cm.lineCount()) : Math.max(-1, i - 100); 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 textare whever 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);
    });
  }

@@ -80,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);
+  });
+});
--- a/applications/admin/static/codemirror/addon/edit/matchtags.js
+++ b/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);
+    }
+  };
+});
--- a/applications/admin/static/codemirror/addon/edit/trailingspace.js
+++ b/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"
+      });
+  });
 });
--- a/applications/admin/static/codemirror/addon/fold/brace-fold.js
+++ b/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
+
+});
--- a/applications/admin/static/codemirror/addon/fold/comment-fold.js
+++ b/applications/admin/static/codemirror/addon/fold/comment-fold.js
@@ -0,0 +1,57 @@
+// 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) {
+  var mode = cm.getModeAt(start), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
+  if (!startToken || !endToken) return;
+  var line = start.line, lineText = cm.getLine(line);
+
+  var startCh;
+  for (var at = start.ch, pass = 0;;) {
+    var found = at <= 0 ? -1 : lineText.lastIndexOf(startToken, at - 1);
+    if (found == -1) {
+      if (pass == 1) return;
+      pass = 1;
+      at = lineText.length;
+      continue;
+    }
+    if (pass == 1 && found < start.ch) return;
+    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1)))) {
+      startCh = found + startToken.length;
+      break;
+    }
+    at = found - 1;
+  }
+
+  var depth = 1, lastLine = cm.lastLine(), end, endCh;
+  outer: for (var i = line; i <= lastLine; ++i) {
+    var text = cm.getLine(i), pos = i == line ? startCh : 0;
+    for (;;) {
+      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+      if (nextOpen < 0) nextOpen = text.length;
+      if (nextClose < 0) nextClose = text.length;
+      pos = Math.min(nextOpen, nextClose);
+      if (pos == text.length) break;
+      if (pos == nextOpen) ++depth;
+      else if (!--depth) { end = i; endCh = pos; break outer; }
+      ++pos;
+    }
+  }
+  if (end == null || line == end && endCh == startCh) return;
+  return {from: CodeMirror.Pos(line, startCh),
+          to: CodeMirror.Pos(end, endCh)};
+});
+
+});
--- a/applications/admin/static/codemirror/addon/fold/foldcode.js
+++ b/applications/admin/static/codemirror/addon/fold/foldcode.js
@@ -1,19 +1,32 @@
-(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) {
-    var finder = options && (options.call ? options : options.rangeFinder);
-    if (!finder) finder = cm.getHelper(pos, "fold");
-    if (!finder) return;
+  function doFold(cm, pos, options, force) {
+    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);
      if (!range || range.to.line - range.from.line < minSize) return null;
      var marks = cm.findMarksAt(range.from);
      for (var i = 0; i < marks.length; ++i) {
-        if (marks[i].__isFold) {
+        if (marks[i].__isFold && force !== "fold") {
          if (!allowFolded) return null;
          range.cleared = true;
          marks[i].clear();
@@ -23,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) return;
+    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,
@@ -42,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");
@@ -59,7 +75,37 @@
  };

  // New-style interface
-  CodeMirror.defineExtension("foldCode", function(pos, options) { doFold(this, pos, options); });
+  CodeMirror.defineExtension("foldCode", function(pos, options, force) {
+    doFold(this, pos, options, force);
+  });
+
+  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);
@@ -70,4 +116,34 @@
      }
    };
  });
-})();
+
+  CodeMirror.registerHelper("fold", "auto", function(cm, start) {
+    var helpers = cm.getHelpers(start, "fold");
+    for (var i = 0; i < helpers.length; i++) {
+      var cur = helpers[i](cm, start);
+      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);
+  });
+});
--- a/applications/admin/static/codemirror/addon/fold/foldgutter.css
+++ b/applications/admin/static/codemirror/addon/fold/foldgutter.css
@@ -0,0 +1,20 @@
+.CodeMirror-foldmarker {
+  color: blue;
+  text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
+  font-family: arial;
+  line-height: .3;
+  cursor: pointer;
+}
+.CodeMirror-foldgutter {
+  width: .7em;
+}
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded {
+  cursor: pointer;
+}
+.CodeMirror-foldgutter-open:after {
+  content: "\25BE";
+}
+.CodeMirror-foldgutter-folded:after {
+  content: "\25B8";
+}
--- a/applications/admin/static/codemirror/addon/fold/foldgutter.js
+++ b/applications/admin/static/codemirror/addon/fold/foldgutter.js
@@ -0,0 +1,144 @@
+// 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) {
+    if (old && old != CodeMirror.Init) {
+      cm.clearGutter(cm.state.foldGutter.options.gutter);
+      cm.state.foldGutter = null;
+      cm.off("gutterClick", onGutterClick);
+      cm.off("change", onChange);
+      cm.off("viewportChange", onViewportChange);
+      cm.off("fold", onFold);
+      cm.off("unfold", onFold);
+      cm.off("swapDoc", updateInViewport);
+    }
+    if (val) {
+      cm.state.foldGutter = new State(parseOptions(val));
+      updateInViewport(cm);
+      cm.on("gutterClick", onGutterClick);
+      cm.on("change", onChange);
+      cm.on("viewportChange", onViewportChange);
+      cm.on("fold", onFold);
+      cm.on("unfold", onFold);
+      cm.on("swapDoc", updateInViewport);
+    }
+  });
+
+  var Pos = CodeMirror.Pos;
+
+  function State(options) {
+    this.options = options;
+    this.from = this.to = 0;
+  }
+
+  function parseOptions(opts) {
+    if (opts === true) opts = {};
+    if (opts.gutter == null) opts.gutter = "CodeMirror-foldgutter";
+    if (opts.indicatorOpen == null) opts.indicatorOpen = "CodeMirror-foldgutter-open";
+    if (opts.indicatorFolded == null) opts.indicatorFolded = "CodeMirror-foldgutter-folded";
+    return opts;
+  }
+
+  function isFolded(cm, line) {
+    var marks = cm.findMarksAt(Pos(line));
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold && marks[i].find().from.line == line) return true;
+  }
+
+  function marker(spec) {
+    if (typeof spec == "string") {
+      var elt = document.createElement("div");
+      elt.className = spec + " CodeMirror-guttermarker-subtle";
+      return elt;
+    } else {
+      return spec.cloneNode(true);
+    }
+  }
+
+  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);
+        var range = func && func(cm, pos);
+        if (range && range.to.line - range.from.line >= minSize)
+          mark = marker(opts.indicatorOpen);
+      }
+      cm.setGutterMarker(line, opts.gutter, mark);
+      ++cur;
+    });
+  }
+
+  function updateInViewport(cm) {
+    var vp = cm.getViewport(), state = cm.state.foldGutter;
+    if (!state) return;
+    cm.operation(function() {
+      updateFoldInfo(cm, vp.from, vp.to);
+    });
+    state.from = vp.from; state.to = vp.to;
+  }
+
+  function onGutterClick(cm, line, gutter) {
+    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;
+    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;
+    if (!state) return;
+    var opts = state.options;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() {
+      var vp = cm.getViewport();
+      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
+        updateInViewport(cm);
+      } else {
+        cm.operation(function() {
+          if (vp.from < state.from) {
+            updateFoldInfo(cm, vp.from, state.from);
+            state.from = vp.from;
+          }
+          if (vp.to > state.to) {
+            updateFoldInfo(cm, state.to, vp.to);
+            state.to = vp.to;
+          }
+        });
+      }
+    }, opts.updateViewportTimeSpan || 400);
+  }
+
+  function onFold(cm, from) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var line = from.line;
+    if (line >= state.from && line < state.to)
+      updateFoldInfo(cm, line, line + 1);
+  }
+});
--- a/applications/admin/static/codemirror/addon/fold/indent-fold.js
+++ b/applications/admin/static/codemirror/addon/fold/indent-fold.js
@@ -1,12 +1,44 @@
+// 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);
-  var myIndent = CodeMirror.countColumn(firstLine, null, tabSize);
-  for (var i = start.line + 1, end = cm.lineCount(); i < end; ++i) {
+  if (!/\S/.test(firstLine)) return;
+  var getIndent = function(line) {
+    return CodeMirror.countColumn(line, null, tabSize);
+  };
+  var myIndent = getIndent(firstLine);
+  var lastLineInFold = null;
+  // Go through lines until we find a line that definitely doesn't belong in
+  // the block we're folding, or to the end.
+  for (var i = start.line + 1, end = cm.lastLine(); i <= end; ++i) {
    var curLine = cm.getLine(i);
-    if (CodeMirror.countColumn(curLine, null, tabSize) < myIndent &&
-        CodeMirror.countColumn(cm.getLine(i-1), null, tabSize) > myIndent)
-      return {from: CodeMirror.Pos(start.line, firstLine.length),
-              to: CodeMirror.Pos(i, curLine.length)};
+    var curIndent = getIndent(curLine);
+    if (curIndent > myIndent) {
+      // Lines with a greater indent are considered part of the block.
+      lastLineInFold = i;
+    } else if (!/\S/.test(curLine)) {
+      // Empty lines might be breaks within the block we're trying to fold.
+    } else {
+      // A non-empty line at an indent equal to or less than ours marks the
+      // start of another block.
+      break;
+    }
  }
+  if (lastLineInFold) return {
+    from: CodeMirror.Pos(start.line, firstLine.length),
+    to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
+  };
+});
+
 });
-CodeMirror.indentRangeFinder = CodeMirror.fold.indent; // deprecated
--- a/applications/admin/static/codemirror/addon/fold/markdown-fold.js
+++ b/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)
+  };
+});
+
+});
--- a/applications/admin/static/codemirror/addon/fold/xml-fold.js
+++ b/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"};
@@ -164,4 +173,10 @@
      if (close) return {open: open, close: close};
    }
  };
-})();
+
+  // 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);
+  };
+});
--- a/applications/admin/static/codemirror/addon/hint/anyword-hint.js
+++ b/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)};
+  });
+});
--- a/applications/admin/static/codemirror/addon/hint/css-hint.js
+++ b/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)
+    };
+  });
+});
--- a/applications/admin/static/codemirror/addon/hint/html-hint.js
+++ b/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);
-})();
+});
--- a/applications/admin/static/codemirror/addon/hint/javascript-hint.js
+++ b/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,34 +30,25 @@

  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));
      if (tprop.string != ".") return;
      tprop = getToken(editor, Pos(cur.line, tprop.start));
-      if (tprop.string == ')') {
-        var level = 1;
-        do {
-          tprop = getToken(editor, Pos(cur.line, tprop.start));
-          switch (tprop.string) {
-          case ')': level++; break;
-          case '(': level--; break;
-          default: break;
-          }
-        } while (level > 0);
-        tprop = getToken(editor, Pos(cur.line, tprop.start));
-        if (tprop.type.indexOf("variable") === 0)
-          tprop.type = "function";
-        else return; // no clue
-      }
      if (!context) var context = [];
      context.push(tprop);
    }
@@ -61,7 +62,6 @@
                      function (e, cur) {return e.getTokenAt(cur);},
                      options);
  };
-  CodeMirror.javascriptHint = javascriptHint; // deprecated
  CodeMirror.registerHelper("hint", "javascript", javascriptHint);

  function getCoffeeScriptToken(editor, cur) {
@@ -85,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 " +
@@ -99,9 +98,9 @@
                  "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.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
+      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
    }
    function gatherCompletions(obj) {
      if (typeof obj == "string") forEach(stringProps, maybeAdd);
@@ -110,37 +109,38 @@
      for (var name in obj) maybeAdd(name);
    }

-    if (context) {
+    if (context && context.length) {
      // 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.indexOf("variable") === 0) {
+      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
+    } else {
+      // 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;
  }
-})();
+});
--- a/applications/admin/static/codemirror/addon/hint/pig-hint.js
+++ b/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.indexOf(start) == 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;
-  }
-})();
--- a/applications/admin/static/codemirror/addon/hint/python-hint.js
+++ b/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]);
  }
@@ -31,10 +40,6 @@

    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),
@@ -44,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"
@@ -66,7 +70,7 @@
  function getCompletions(token, context) {
    var found = [], start = token.string;
    function maybeAdd(str) {
-      if (str.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
+      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
    }

    function gatherCompletions(_obj) {
@@ -92,4 +96,4 @@
    }
    return found;
  }
-})();
+});
--- a/applications/admin/static/codemirror/addon/hint/show-hint.css
+++ b/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;
 }
--- a/applications/admin/static/codemirror/addon/hint/show-hint.js
+++ b/applications/admin/static/codemirror/addon/hint/show-hint.js
@@ -1,26 +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) getHints = cm.getHelper(cm.getCursor(), "hint");
-    if (getHints == null) return;
-
-    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;
  }

@@ -41,14 +72,16 @@
    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();
    },

    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);
@@ -58,10 +91,15 @@
      this.widget = new Widget(this, data);
      CodeMirror.signal(data, "shown");

-      var debounce = null, completion = this, finished;
-      var closeOn = this.options.closeCharacters || /[\s()\[\]{};:>,]/;
+      var debounce = 0, completion = this, finished;
+      var closeOn = this.options.closeCharacters;
      var startPos = this.cm.getCursor(), startLen = this.cm.getLine(startPos.line).length;

+      var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
+        return setTimeout(fn, 1000/60);
+      };
+      var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
+
      function done() {
        if (finished) return;
        finished = true;
@@ -73,32 +111,48 @@
      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);
      }

+      function clearDebounce() {
+        if (debounce) {
+          cancelAnimationFrame(debounce);
+          debounce = 0;
+        }
+      }
+
      function activity() {
-        clearTimeout(debounce);
+        clearDebounce();
        var pos = completion.cm.getCursor(), line = completion.cm.getLine(pos.line);
        if (pos.line != startPos.line || line.length - pos.ch != startLen - startPos.ch ||
            pos.ch < startPos.ch || completion.cm.somethingSelected() ||
            (pos.ch && closeOn.test(line.charAt(pos.ch - 1)))) {
          completion.close();
        } else {
-          debounce = setTimeout(update, 170);
+          debounce = requestAnimationFrame(update);
          if (completion.widget) completion.widget.close();
        }
      }
      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;
    }
  };

@@ -107,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);},
@@ -119,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")
@@ -131,28 +186,36 @@
        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;
  }

+  function getHintElement(hintsElement, el) {
+    while (el && el != hintsElement) {
+      if (el.nodeName.toUpperCase() === "LI" && el.parentNode == hintsElement) return el;
+      el = el.parentNode;
+    }
+  }
+
  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 = 0;
+    this.selectedHint = data.selectedHint || 0;

    var completions = data.list;
    for (var i = 0; i < completions.length; ++i) {
      var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
-      var className = "CodeMirror-hint" + (i ? "" : " CodeMirror-hint-active");
+      var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
      if (cur.className != null) className = cur.className + " " + className;
      elt.className = className;
      if (cur.render) cur.render(elt, data, cur);
@@ -160,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";
@@ -177,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); });
@@ -216,13 +285,18 @@
    });

    CodeMirror.on(hints, "dblclick", function(e) {
-      var t = e.target || e.srcElement;
-      if (t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
+      var t = getHintElement(hints, e.target || e.srcElement);
+      if (t && t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
    });
+
    CodeMirror.on(hints, "click", function(e) {
-      var t = e.target || e.srcElement;
-      if (t.hintId != null) widget.changeActive(t.hintId);
+      var t = getHintElement(hints, e.target || e.srcElement);
+      if (t && t.hintId != null) {
+        widget.changeActive(t.hintId);
+        if (completion.options.completeOnSingleClick) widget.pick();
+      }
    });
+
    CodeMirror.on(hints, "mousedown", function() {
      setTimeout(function(){cm.focus();}, 20);
    });
@@ -239,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);
      }
@@ -257,9 +331,9 @@
        i = avoidWrap ? 0  : this.data.list.length - 1;
      if (this.selectedHint == i) return;
      var node = this.hints.childNodes[this.selectedHint];
-      node.className = node.className.replace(" CodeMirror-hint-active", "");
+      node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
      node = this.hints.childNodes[this.selectedHint = i];
-      node.className += " CodeMirror-hint-active";
+      node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
      if (node.offsetTop < this.hints.scrollTop)
        this.hints.scrollTop = node.offsetTop - 3;
      else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
@@ -271,4 +345,50 @@
      return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
    }
  };
-})();
+
+  CodeMirror.registerHelper("hint", "auto", function(cm, options) {
+    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 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);
+    }
+  });
+
+  CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    var found = [];
+    for (var i = 0; i < options.words.length; i++) {
+      var word = options.words[i];
+      if (word.slice(0, token.string.length) == token.string)
+        found.push(word);
+    }
+
+    if (found.length) return {
+      list: found,
+      from: CodeMirror.Pos(cur.line, token.start),
+            to: CodeMirror.Pos(cur.line, token.end)
+    };
+  });
+
+  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);
+});
--- a/applications/admin/static/codemirror/addon/hint/sql-hint.js
+++ b/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)};
+  });
+});
--- a/applications/admin/static/codemirror/addon/hint/xml-hint.js
+++ b/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,61 +18,93 @@
    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) {
-        for (var i = 0; i < childList.length; ++i) if (!prefix || childList[i].indexOf(prefix) == 0)
+      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.indexOf(prefix) == 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).indexOf(prefix) == 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));
        var atName = before.match(/([^\s\u00a0=<>\"\']+)=$/), atValues;
        if (!atName || !attrs.hasOwnProperty(atName[1]) || !(atValues = attrs[atName[1]])) return;
+        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;
        }
-        for (var i = 0; i < atValues.length; ++i) if (!prefix || atValues[i].indexOf(prefix) == 0)
+        for (var i = 0; i < atValues.length; ++i) if (!prefix || atValues[i].lastIndexOf(prefix, 0) == 0)
          result.push(quote + atValues[i] + quote);
      } else { // An attribute name
        if (token.type == "attribute") {
          prefix = token.string;
          replaceToken = true;
        }
-        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || attr.indexOf(prefix) == 0))
+        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || attr.lastIndexOf(prefix, 0) == 0))
          result.push(attr);
      }
    }
    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);
-})();
+});
--- a/applications/admin/static/codemirror/addon/lint/coffeescript-lint.js
+++ b/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
--- a/applications/admin/static/codemirror/addon/lint/javascript-lint.js
+++ b/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)});
-      }
-    }
-  }
-})();
--- a/applications/admin/static/codemirror/addon/lint/json-lint.js
+++ b/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
--- a/applications/admin/static/codemirror/addon/lint/lint.css
+++ b/applications/admin/static/codemirror/addon/lint/lint.css
@@ -1,72 +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;
-  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%;
-}
--- a/applications/admin/static/codemirror/addon/lint/lint.js
+++ b/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));
-  }
-
-  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
-})();
--- a/applications/admin/static/codemirror/addon/merge/dep/diff_match_patch.js
+++ b/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;})()
--- a/applications/admin/static/codemirror/addon/merge/merge.css
+++ b/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; }
--- a/applications/admin/static/codemirror/addon/merge/merge.js
+++ b/applications/admin/static/codemirror/addon/merge/merge.js
@@ -1,474 +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(orig, 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);
-    }
-  };
-
-  // 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; }
-})();
--- a/applications/admin/static/codemirror/addon/mode/loadmode.js
+++ b/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"));
      });
  };
-}());
+});
--- a/applications/admin/static/codemirror/addon/mode/multiplex.js
+++ b/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);
@@ -47,7 +60,11 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
        return outerToken;
      } else {
        var curInner = state.innerActive, oldContent = stream.string;
-        var found = indexOf(oldContent, curInner.close, stream.pos);
+        if (!curInner.close && stream.sol()) {
+          state.innerActive = state.inner = null;
+          return this.token(stream, state);
+        }
+        var found = curInner.close ? indexOf(oldContent, curInner.close, stream.pos) : -1;
        if (found == stream.pos) {
          stream.match(curInner.close);
          state.innerActive = state.inner = null;
@@ -56,8 +73,6 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
        if (found > -1) stream.string = oldContent.slice(0, found);
        var innerToken = curInner.mode.token(stream, state.inner);
        if (found > -1) stream.string = oldContent;
-        var cur = stream.current(), found = cur.indexOf(curInner.close);
-        if (found > -1) stream.backUp(cur.length - found);

        if (curInner.innerStyle) {
          if (innerToken) innerToken = innerToken + ' ' + curInner.innerStyle;
@@ -99,3 +114,5 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
    }
  };
 };
+
+});
--- a/applications/admin/static/codemirror/addon/mode/multiplex_test.js
+++ b/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");
--- a/applications/admin/static/codemirror/addon/mode/overlay.js
+++ b/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
    }
  };
 };
+
+});
--- a/applications/admin/static/codemirror/addon/mode/simple.js
+++ b/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];
+    };
+  }
+});
--- a/applications/admin/static/codemirror/addon/runmode/colorize.js
+++ b/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";
-    }
-  };
-})();
--- a/applications/admin/static/codemirror/addon/runmode/runmode-standalone.js
+++ b/applications/admin/static/codemirror/addon/runmode/runmode-standalone.js
@@ -1,136 +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;
-}
-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;},
-  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);}
-};
-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.getMode = function (options, spec) {
-  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
-    spec = mimeModes[spec];
-  if (typeof spec == "string")
-    var mname = spec, config = {};
-  else if (spec != null)
-    var mname = spec.name, config = spec;
-  var mfactory = modes[mname];
-  if (!mfactory) throw new Error("Unknown mode: " + spec);
-  return mfactory(options, config || {});
-};
-
-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 = 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;
-    }
-  }
-};
-})();
--- a/applications/admin/static/codemirror/addon/runmode/runmode.js
+++ b/applications/admin/static/codemirror/addon/runmode/runmode.js
@@ -1,56 +0,0 @@
-CodeMirror.runMode = function(string, modespec, callback, options) {
-  var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
-  var ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
-
-  if (callback.nodeType == 1) {
-    var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
-    var node = callback, col = 0;
-    node.innerHTML = "";
-    callback = function(text, style) {
-      if (text == "\n") {
-        // Emitting LF or CRLF on IE8 or earlier results in an incorrect display.
-        // Emitting a carriage return makes everything ok.
-        node.appendChild(document.createTextNode(ie_lt9 ? '\r' : text));
-        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 = CodeMirror.splitLines(string), 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;
-    }
-  }
-};
--- a/applications/admin/static/codemirror/addon/runmode/runmode.node.js
+++ b/applications/admin/static/codemirror/addon/runmode/runmode.node.js
@@ -1,103 +0,0 @@
-/* Just enough of CodeMirror to run runMode under node.js */
-
-function splitLines(string){ return string.split(/\r?\n|\r/); };
-
-function StringStream(string) {
-  this.pos = this.start = 0;
-  this.string = string;
-}
-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;},
-  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);}
-};
-exports.StringStream = StringStream;
-
-exports.startState = function(mode, a1, a2) {
-  return mode.startState ? mode.startState(a1, a2) : true;
-};
-
-var modes = exports.modes = {}, mimeModes = exports.mimeModes = {};
-exports.defineMode = function(name, mode) {
-  if (arguments.length > 2) {
-    mode.dependencies = [];
-    for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
-  }
-  modes[name] = mode;
-};
-exports.defineMIME = function(mime, spec) { mimeModes[mime] = spec; };
-
-exports.defineMode("null", function() {
-  return {token: function(stream) {stream.skipToEnd();}};
-});
-exports.defineMIME("text/plain", "null");
-
-exports.getMode = function(options, spec) {
-  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
-    spec = mimeModes[spec];
-  if (typeof spec == "string")
-    var mname = spec, config = {};
-  else if (spec != null)
-    var mname = spec.name, config = spec;
-  var mfactory = modes[mname];
-  if (!mfactory) throw new Error("Unknown mode: " + spec);
-  return mfactory(options, config || {});
-};
-
-exports.runMode = function(string, modespec, callback) {
-  var mode = exports.getMode({indentUnit: 2}, modespec);
-  var lines = splitLines(string), state = exports.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
-    if (i) callback("\n");
-    var stream = new exports.StringStream(lines[i]);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
--- a/applications/admin/static/codemirror/addon/search/match-highlighter.js
+++ b/applications/admin/static/codemirror/addon/search/match-highlighter.js
@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Highlighting text that matches the selection
 //
 // Defines an option highlightSelectionMatches, which, when enabled,
@@ -5,17 +8,30 @@
 // document.
 //
 // The option can be set to true to simply enable it, or to a
-// {minChars, style, showToken} object to explicitly configure it.
-// minChars is the minimum amount of characters that should be
+// {minChars, style, wordsOnly, showToken, delay} object to explicitly
+// configure it. minChars is the minimum amount of characters that should be
 // selected for the behavior to occur, and style is the token style to
 // apply to the matches. This will be prefixed by "cm-" to create an
-// actual CSS class name. showToken, when enabled, will cause the
-// current token to be highlighted when nothing is selected.
+// actual CSS class name. If wordsOnly is enabled, the matches will be
+// highlighted only if the selected text is a word. showToken, when enabled,
+// will cause the current token to be highlighted when nothing is selected.
+// delay is used to specify how much time to wait, in milliseconds, before
+// highlighting the matches.
+
+(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() {
  var DEFAULT_MIN_CHARS = 2;
  var DEFAULT_TOKEN_STYLE = "matchhighlight";
  var DEFAULT_DELAY = 100;
+  var DEFAULT_WORDS_ONLY = false;

  function State(options) {
    if (typeof options == "object") {
@@ -23,10 +39,12 @@
      this.style = options.style;
      this.showToken = options.showToken;
      this.delay = options.delay;
+      this.wordsOnly = options.wordsOnly;
    }
    if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
    if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
    if (this.delay == null) this.delay = DEFAULT_DELAY;
+    if (this.wordsOnly == null) this.wordsOnly = DEFAULT_WORDS_ONLY;
    this.overlay = this.timeout = null;
  }

@@ -67,13 +85,32 @@
          cm.addOverlay(state.overlay = makeOverlay(line.slice(start, end), re, state.style));
        return;
      }
-      if (cm.getCursor("head").line != cm.getCursor("anchor").line) return;
-      var selection = cm.getSelection().replace(/^\s+|\s+$/g, "");
+      var from = cm.getCursor("from"), to = cm.getCursor("to");
+      if (from.line != to.line) return;
+      if (state.wordsOnly && !isWord(cm, from, to)) return;
+      var selection = cm.getRange(from, to).replace(/^\s+|\s+$/g, "");
      if (selection.length >= state.minChars)
        cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
    });
  }

+  function isWord(cm, from, to) {
+    var str = cm.getRange(from, to);
+    if (str.match(/^\w+$/) !== null) {
+        if (from.ch > 0) {
+            var pos = {line: from.line, ch: from.ch - 1};
+            var chr = cm.getRange(pos, from);
+            if (chr.match(/\W/) === null) return false;
+        }
+        if (to.ch < cm.getLine(from.line).length) {
+            var pos = {line: to.line, ch: to.ch + 1};
+            var chr = cm.getRange(to, pos);
+            if (chr.match(/\W/) === null) return false;
+        }
+        return true;
+    } else return false;
+  }
+
  function boundariesAround(stream, re) {
    return (!stream.start || !re.test(stream.string.charAt(stream.start - 1))) &&
      (stream.pos == stream.string.length || !re.test(stream.string.charAt(stream.pos)));
@@ -88,4 +125,4 @@
      stream.skipTo(query.charAt(0)) || stream.skipToEnd();
    }};
  }
-})();
+});
--- a/applications/admin/static/codemirror/addon/search/matchesonscrollbar.css
+++ b/applications/admin/static/codemirror/addon/search/matchesonscrollbar.css
@@ -0,0 +1,8 @@
+.CodeMirror-search-match {
+  background: gold;
+  border-top: 1px solid orange;
+  border-bottom: 1px solid orange;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  opacity: .5;
+}
--- a/applications/admin/static/codemirror/addon/search/matchesonscrollbar.js
+++ b/applications/admin/static/codemirror/addon/search/matchesonscrollbar.js
@@ -0,0 +1,95 @@
+// 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("./searchcursor"), require("../scroll/annotatescrollbar"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./searchcursor", "../scroll/annotatescrollbar"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineExtension("showMatchesOnScrollbar", function(query, caseFold, options) {
+    if (typeof options == "string") options = {className: options};
+    if (!options) options = {};
+    return new SearchAnnotation(this, query, caseFold, options);
+  });
+
+  function SearchAnnotation(cm, query, caseFold, options) {
+    this.cm = cm;
+    var annotateOptions = {listenForChanges: false};
+    for (var prop in options) annotateOptions[prop] = options[prop];
+    if (!annotateOptions.className) annotateOptions.className = "CodeMirror-search-match";
+    this.annotation = cm.annotateScrollbar(annotateOptions);
+    this.query = query;
+    this.caseFold = caseFold;
+    this.gap = {from: cm.firstLine(), to: cm.lastLine() + 1};
+    this.matches = [];
+    this.update = null;
+
+    this.findMatches();
+    this.annotation.update(this.matches);
+
+    var self = this;
+    cm.on("change", this.changeHandler = function(_cm, change) { self.onChange(change); });
+  }
+
+  var MAX_MATCHES = 1000;
+
+  SearchAnnotation.prototype.findMatches = function() {
+    if (!this.gap) return;
+    for (var i = 0; i < this.matches.length; i++) {
+      var match = this.matches[i];
+      if (match.from.line >= this.gap.to) break;
+      if (match.to.line >= this.gap.from) this.matches.splice(i--, 1);
+    }
+    var cursor = this.cm.getSearchCursor(this.query, CodeMirror.Pos(this.gap.from, 0), this.caseFold);
+    while (cursor.findNext()) {
+      var match = {from: cursor.from(), to: cursor.to()};
+      if (match.from.line >= this.gap.to) break;
+      this.matches.splice(i++, 0, match);
+      if (this.matches.length > MAX_MATCHES) break;
+    }
+    this.gap = null;
+  };
+
+  function offsetLine(line, changeStart, sizeChange) {
+    if (line <= changeStart) return line;
+    return Math.max(changeStart, line + sizeChange);
+  }
+
+  SearchAnnotation.prototype.onChange = function(change) {
+    var startLine = change.from.line;
+    var endLine = CodeMirror.changeEnd(change).line;
+    var sizeChange = endLine - change.to.line;
+    if (this.gap) {
+      this.gap.from = Math.min(offsetLine(this.gap.from, startLine, sizeChange), change.from.line);
+      this.gap.to = Math.max(offsetLine(this.gap.to, startLine, sizeChange), change.from.line);
+    } else {
+      this.gap = {from: change.from.line, to: endLine + 1};
+    }
+
+    if (sizeChange) for (var i = 0; i < this.matches.length; i++) {
+      var match = this.matches[i];
+      var newFrom = offsetLine(match.from.line, startLine, sizeChange);
+      if (newFrom != match.from.line) match.from = CodeMirror.Pos(newFrom, match.from.ch);
+      var newTo = offsetLine(match.to.line, startLine, sizeChange);
+      if (newTo != match.to.line) match.to = CodeMirror.Pos(newTo, match.to.ch);
+    }
+    clearTimeout(this.update);
+    var self = this;
+    this.update = setTimeout(function() { self.updateAfterChange(); }, 250);
+  };
+
+  SearchAnnotation.prototype.updateAfterChange = function() {
+    this.findMatches();
+    this.annotation.update(this.matches);
+  };
+
+  SearchAnnotation.prototype.clear = function() {
+    this.cm.off("change", this.changeHandler);
+    this.annotation.clear();
+  };
+});
--- a/applications/admin/static/codemirror/addon/search/search.js
+++ b/applications/admin/static/codemirror/addon/search/search.js
@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Define search commands. Depends on dialog.js or another
 // implementation of the openDialog method.

@@ -6,18 +9,31 @@
 // replace by making sure the match is no longer selected when hitting
 // Ctrl-G.

-(function() {
-  function searchOverlay(query) {
-    if (typeof query == "string") return {token: function(stream) {
-      if (stream.match(query)) return "searching";
-      stream.next();
-      stream.skipTo(query.charAt(0)) || stream.skipToEnd();
-    }};
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../dialog/dialog"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./searchcursor", "../dialog/dialog"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  function searchOverlay(query, caseInsensitive) {
+    if (typeof query == "string")
+      query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"), caseInsensitive ? "gi" : "g");
+    else if (!query.global)
+      query = new RegExp(query.source, query.ignoreCase ? "gi" : "g");
+
    return {token: function(stream) {
-      if (stream.match(query)) return "searching";
-      while (!stream.eol()) {
-        stream.next();
-        if (stream.match(query, false)) break;
+      query.lastIndex = stream.pos;
+      var match = query.exec(stream.string);
+      if (match && match.index == stream.pos) {
+        stream.pos += match[0].length;
+        return "searching";
+      } else if (match) {
+        stream.pos = match.index;
+      } else {
+        stream.skipToEnd();
      }
    }};
  }
@@ -29,13 +45,16 @@
  function getSearchState(cm) {
    return cm.state.search || (cm.state.search = new SearchState());
  }
+  function queryCaseInsensitive(query) {
+    return typeof query == "string" && query == query.toLowerCase();
+  }
  function getSearchCursor(cm, query, pos) {
    // Heuristic: if the query string is all lowercase, do a case insensitive search.
-    return cm.getSearchCursor(query, pos, typeof query == "string" && query == query.toLowerCase());
+    return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
  }
-  function dialog(cm, text, shortText, f) {
-    if (cm.openDialog) cm.openDialog(text, f);
-    else f(prompt(shortText, ""));
+  function dialog(cm, text, shortText, deflt, f) {
+    if (cm.openDialog) cm.openDialog(text, f, {value: deflt});
+    else f(prompt(shortText, deflt));
  }
  function confirmDialog(cm, text, shortText, fs) {
    if (cm.openConfirm) cm.openConfirm(text, fs);
@@ -43,20 +62,30 @@
  }
  function parseQuery(query) {
    var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
-    return isRE ? new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i") : query;
+    if (isRE) {
+      try { query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i"); }
+      catch(e) {} // Not a regular expression after all, do a string search
+    }
+    if (typeof query == "string" ? query == "" : query.test(""))
+      query = /x^/;
+    return query;
  }
  var queryDialog =
-    'Search: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp search)</span>';
+    'Search: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
  function doSearch(cm, rev) {
    var state = getSearchState(cm);
    if (state.query) return findNext(cm, rev);
-    dialog(cm, queryDialog, "Search for:", function(query) {
+    dialog(cm, queryDialog, "Search for:", cm.getSelection(), function(query) {
      cm.operation(function() {
        if (!query || state.query) return;
        state.query = parseQuery(query);
-        cm.removeOverlay(state.overlay);
-        state.overlay = searchOverlay(state.query);
+        cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query));
+        state.overlay = searchOverlay(state.query, queryCaseInsensitive(state.query));
        cm.addOverlay(state.overlay);
+        if (cm.showMatchesOnScrollbar) {
+          if (state.annotate) { state.annotate.clear(); state.annotate = null; }
+          state.annotate = cm.showMatchesOnScrollbar(state.query, queryCaseInsensitive(state.query));
+        }
        state.posFrom = state.posTo = cm.getCursor();
        findNext(cm, rev);
      });
@@ -70,6 +99,7 @@
      if (!cursor.find(rev)) return;
    }
    cm.setSelection(cursor.from(), cursor.to());
+    cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
    state.posFrom = cursor.from(); state.posTo = cursor.to();
  });}
  function clearSearch(cm) {cm.operation(function() {
@@ -77,23 +107,25 @@
    if (!state.query) return;
    state.query = null;
    cm.removeOverlay(state.overlay);
+    if (state.annotate) { state.annotate.clear(); state.annotate = null; }
  });}

  var replaceQueryDialog =
-    'Replace: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp search)</span>';
-  var replacementQueryDialog = 'With: <input type="text" style="width: 10em"/>';
+    'Replace: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
+  var replacementQueryDialog = 'With: <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
  var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>Stop</button>";
  function replace(cm, all) {
-    dialog(cm, replaceQueryDialog, "Replace:", function(query) {
+    if (cm.getOption("readOnly")) return;
+    dialog(cm, replaceQueryDialog, "Replace:", cm.getSelection(), function(query) {
      if (!query) return;
      query = parseQuery(query);
-      dialog(cm, replacementQueryDialog, "Replace with:", function(text) {
+      dialog(cm, replacementQueryDialog, "Replace with:", "", function(text) {
        if (all) {
          cm.operation(function() {
            for (var cursor = getSearchCursor(cm, query); cursor.findNext();) {
              if (typeof query != "string") {
                var match = cm.getRange(cursor.from(), cursor.to()).match(query);
-                cursor.replace(text.replace(/\$(\d)/, function(_, i) {return match[i];}));
+                cursor.replace(text.replace(/\$(\d)/g, function(_, i) {return match[i];}));
              } else cursor.replace(text);
            }
          });
@@ -108,12 +140,13 @@
                  (start && cursor.from().line == start.line && cursor.from().ch == start.ch)) return;
            }
            cm.setSelection(cursor.from(), cursor.to());
+            cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
            confirmDialog(cm, doReplaceConfirm, "Replace?",
                          [function() {doReplace(match);}, advance]);
          };
          var doReplace = function(match) {
            cursor.replace(typeof query == "string" ? text :
-                           text.replace(/\$(\d)/, function(_, i) {return match[i];}));
+                           text.replace(/\$(\d)/g, function(_, i) {return match[i];}));
            advance();
          };
          advance();
@@ -128,4 +161,4 @@
  CodeMirror.commands.clearSearch = clearSearch;
  CodeMirror.commands.replace = replace;
  CodeMirror.commands.replaceAll = function(cm) {replace(cm, true);};
-})();
+});
--- a/applications/admin/static/codemirror/addon/search/searchcursor.js
+++ b/applications/admin/static/codemirror/addon/search/searchcursor.js
@@ -1,4 +1,15 @@
-(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;

  function SearchCursor(doc, query, pos, caseFold) {
@@ -47,6 +58,7 @@
                  match: match};
      };
    } else { // String query
+      var origQuery = query;
      if (caseFold) query = query.toLowerCase();
      var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
      var target = query.split("\n");
@@ -58,33 +70,45 @@
          this.matches = function() {};
        } else {
          this.matches = function(reverse, pos) {
-            var line = fold(doc.getLine(pos.line)), len = query.length, match;
-            if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1)
-                        : (match = line.indexOf(query, pos.ch)) != -1)
-              return {from: Pos(pos.line, match),
-                      to: Pos(pos.line, match + len)};
+            if (reverse) {
+              var orig = doc.getLine(pos.line).slice(0, pos.ch), line = fold(orig);
+              var match = line.lastIndexOf(query);
+              if (match > -1) {
+                match = adjustPos(orig, line, match);
+                return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
+              }
+             } else {
+               var orig = doc.getLine(pos.line).slice(pos.ch), line = fold(orig);
+               var match = line.indexOf(query);
+               if (match > -1) {
+                 match = adjustPos(orig, line, match) + pos.ch;
+                 return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
+               }
+            }
          };
        }
      } else {
+        var origTarget = origQuery.split("\n");
        this.matches = function(reverse, pos) {
-          var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(doc.getLine(ln));
-          var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match));
-          if (reverse ? offsetA > pos.ch || offsetA != match.length
-              : offsetA < pos.ch || offsetA != line.length - match.length)
-            return;
-          for (;;) {
-            if (reverse ? !ln : ln == doc.lineCount() - 1) return;
-            line = fold(doc.getLine(ln += reverse ? -1 : 1));
-            match = target[reverse ? --idx : ++idx];
-            if (idx > 0 && idx < target.length - 1) {
-              if (line != match) return;
-              else continue;
-            }
-            var offsetB = (reverse ? line.lastIndexOf(match) : line.indexOf(match) + match.length);
-            if (reverse ? offsetB != line.length - match.length : offsetB != match.length)
-              return;
-            var start = Pos(pos.line, offsetA), end = Pos(ln, offsetB);
-            return {from: reverse ? end : start, to: reverse ? start : end};
+          var last = target.length - 1;
+          if (reverse) {
+            if (pos.line - (target.length - 1) < doc.firstLine()) return;
+            if (fold(doc.getLine(pos.line).slice(0, origTarget[last].length)) != target[target.length - 1]) return;
+            var to = Pos(pos.line, origTarget[last].length);
+            for (var ln = pos.line - 1, i = last - 1; i >= 1; --i, --ln)
+              if (target[i] != fold(doc.getLine(ln))) return;
+            var line = doc.getLine(ln), cut = line.length - origTarget[0].length;
+            if (fold(line.slice(cut)) != target[0]) return;
+            return {from: Pos(ln, cut), to: to};
+          } else {
+            if (pos.line + (target.length - 1) > doc.lastLine()) return;
+            var line = doc.getLine(pos.line), cut = line.length - origTarget[0].length;
+            if (fold(line.slice(cut)) != target[0]) return;
+            var from = Pos(pos.line, cut);
+            for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
+              if (target[i] != fold(doc.getLine(ln))) return;
+            if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return;
+            return {from: from, to: Pos(ln, origTarget[last].length)};
          }
        };
      }
@@ -106,7 +130,6 @@

      for (;;) {
        if (this.pos = this.matches(reverse, pos)) {
-          if (!this.pos.from || !this.pos.to) { console.log(this.matches, this.pos); }
          this.atOccurrence = true;
          return this.pos.match || true;
        }
@@ -134,10 +157,33 @@
    }
  };

+  // Maps a position in a case-folded line back to a position in the original line
+  // (compensating for codepoints increasing in number during folding)
+  function adjustPos(orig, folded, pos) {
+    if (orig.length == folded.length) return pos;
+    for (var pos1 = Math.min(pos, orig.length);;) {
+      var len1 = orig.slice(0, pos1).toLowerCase().length;
+      if (len1 < pos) ++pos1;
+      else if (len1 > pos) --pos1;
+      else return pos1;
+    }
+  }
+
  CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
    return new SearchCursor(this.doc, query, pos, caseFold);
  });
  CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
    return new SearchCursor(this, query, pos, caseFold);
  });
-})();
+
+  CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
+    var ranges = [], next;
+    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
+    while (next = cur.findNext()) {
+      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
+      ranges.push({anchor: cur.from(), head: cur.to()});
+    }
+    if (ranges.length)
+      this.setSelections(ranges, 0);
+  });
+});
--- a/applications/admin/static/codemirror/addon/selection/active-line.js
+++ b/applications/admin/static/codemirror/addon/selection/active-line.js
@@ -1,10 +1,20 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Because sometimes you need to style the cursor's line.
 //
 // Adds an option 'styleActiveLine' which, when enabled, gives the
 // active line's wrapping <div> the CSS class "CodeMirror-activeline",
 // and gives its background <div> the class "CodeMirror-activeline-background".

-(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";
  var WRAP_CLASS = "CodeMirror-activeline";
  var BACK_CLASS = "CodeMirror-activeline-background";
@@ -12,28 +22,50 @@
  CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
    var prev = old && old != CodeMirror.Init;
    if (val && !prev) {
-      updateActiveLine(cm);
-      cm.on("cursorActivity", updateActiveLine);
+      cm.state.activeLines = [];
+      updateActiveLines(cm, cm.listSelections());
+      cm.on("beforeSelectionChange", selectionChange);
    } else if (!val && prev) {
-      cm.off("cursorActivity", updateActiveLine);
-      clearActiveLine(cm);
-      delete cm.state.activeLine;
+      cm.off("beforeSelectionChange", selectionChange);
+      clearActiveLines(cm);
+      delete cm.state.activeLines;
    }
  });

-  function clearActiveLine(cm) {
-    if ("activeLine" in cm.state) {
-      cm.removeLineClass(cm.state.activeLine, "wrap", WRAP_CLASS);
-      cm.removeLineClass(cm.state.activeLine, "background", BACK_CLASS);
+  function clearActiveLines(cm) {
+    for (var i = 0; i < cm.state.activeLines.length; i++) {
+      cm.removeLineClass(cm.state.activeLines[i], "wrap", WRAP_CLASS);
+      cm.removeLineClass(cm.state.activeLines[i], "background", BACK_CLASS);
    }
  }

-  function updateActiveLine(cm) {
-    var line = cm.getLineHandleVisualStart(cm.getCursor().line);
-    if (cm.state.activeLine == line) return;
-    clearActiveLine(cm);
-    cm.addLineClass(line, "wrap", WRAP_CLASS);
-    cm.addLineClass(line, "background", BACK_CLASS);
-    cm.state.activeLine = line;
+  function sameArray(a, b) {
+    if (a.length != b.length) return false;
+    for (var i = 0; i < a.length; i++)
+      if (a[i] != b[i]) return false;
+    return true;
  }
-})();
+
+  function updateActiveLines(cm, ranges) {
+    var active = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      if (!range.empty()) continue;
+      var line = cm.getLineHandleVisualStart(range.head.line);
+      if (active[active.length - 1] != line) active.push(line);
+    }
+    if (sameArray(cm.state.activeLines, active)) return;
+    cm.operation(function() {
+      clearActiveLines(cm);
+      for (var i = 0; i < active.length; i++) {
+        cm.addLineClass(active[i], "wrap", WRAP_CLASS);
+        cm.addLineClass(active[i], "background", BACK_CLASS);
+      }
+      cm.state.activeLines = active;
+    });
+  }
+
+  function selectionChange(cm, sel) {
+    updateActiveLines(cm, sel.ranges);
+  }
+});
--- a/Show More
+++ b/Show More