R-2.7.1

fixed a problem with grid
2013-10-04 15:14:53 -05:00 · 2013-10-04 15:04:25 -05:00 · 2013-10-04 14:56:16 -05:00 · 2013-10-04 14:41:19 -05:00 · 2013-10-04 14:39:32 -05:00 · 2013-10-04 00:16:30 -05:00
948 changed files with 89284 additions and 50123 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -52,5 +52,6 @@ applications/*/*.py[oc]
 applications/examples/static/epydoc
 applications/examples/static/sphinx
 applications/admin/cron/cron.master
-
-
+HOWTO-web2py-devel
+*.sublime-project
+*.sublime-workspace
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,38 @@
+language: python
+
+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
+
+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
+  
+notifications:
+  email: true
--- a/6
+++ b/6
@@ -0,0 +1,6 @@
+web2py is an open source full-stack framework for agile development 
+of secure database-driven web-based applications, written and programmable in 
+Python. 
+
+Created by Massimo Di Pierro <mdipierro@cs.depaul.edu>
+
--- a/229
+++ b/229
@@ -1,4 +1,195 @@
-## 2.00.1
+## 2.7.1
+
+- jQuery 1.10.2
+- codemirror 3.18, thanks Paolo
+- namespaces in T("Welcome", ns="namespace"), thanks jamarcer (experimental)
+- more Auth options, thanks Charles
+- more admin configuration, thanks Roberto
+- new gluon.contrib.strip.StripeForm for PCI compliant payments
+- webclient can hendle lists, thanks Yair
+- allows SQLFORM.grid(...,ignore_common_filters=True)
+- more translations, thanks Vladyslav
+- better session2trash.py, works with scheduler, thanks niphlod
+- fixed problem with ENABLED/DISABLED
+- many bug fixes, thanks niphlod, michele, anthony, roberto, tim, and others
+
+## 2.6.1 - 2.6.4
+
+Attention all users: For pre 2.6 applications to work with web2py >=2.6, you must copy static/js/web2py.js, controllers/appadmin.py, and views/appadmin.html from the welcome app to your own apps (all of them).
+
+Attention production users: The updated handlers and examples are in handlers/ and examples/. The updated ones will not override the existing ones. To use the new ones it is not sufficient to upgrade web2py, you also need to copy the desired handler/example in the root web2py/ folder.
+
+Attention MySQL users: The length of string fields changed from 255 to 512 bytes. If you have migrations enabled this will trigger a large migration. To prevent it, first set migrate_enabled=False, upgrade, check everything is ok, then add length=255 to your string Fields, then re-enable migrations with migrate_enabled=True if needed.
+
+- better directory structure: handlers/ extras/ examples/
+- better MongoDb support, thanks Alan
+- better Admin editor interface, thanks Paolo, Roberto (codemirror 3), and Lightdot
+- better layout.html and web2py_bootstrap.css, thanks Paolo
+- refactored web2py.js makes code more readable, thanks Niphlod
+- compute fields can depend on other compute(d) fields
+- more functions in appadmin (/manage/auth), thanks Anthony
+- support for CAST in SQL generation
+- new API jQuery('#component').reload()
+- new API rows.render()
+- new API table.field.referent, table._references
+- new API db(...).validate_and_update(...)
+- new API Wiki(..., force_render=True) renders the page source again instead of using cached
+- Wiki now automatically parses named component arguments @{f:a=1,b='twp',c=variable}
+- auth.get_or_create_user(login=False)
+- auth = Auth(crsf_protection = False) prevents creating sessions in login/register forms.
+- enable multiple renderers in wiki, thanks Alan
+- log messages from Auth are no longer translated (for speed and readability)
+- update jQuery mobile to 1.3.1
+- reduced memory footprint by conditionally loading Tk
+- faster pbkdf2 uses OpenSSL, thanks Michele
+- many speed improvements, thanks Michele
+- better session logic, prevents false positive when detecting session changes.
+- scripts/import_static.py converts a static site to a web2py app (experimental)
+- support for new http error code 451
+- profiler saves dump in dir, thanks Niphlod
+- upgraded pyfpdf, thanks Mariano
+- gluon/contrib/pdfinvoice.py for generating PDF invoices (assumes reportlab)
+- no more double submission of forms (even without crsf protection), thanks Niphlod
+- speedup for define_table, thanks Michele
+- settings.cfg to admin, thanks Paolo
+- many bugs fixed, thanks Niphlod, Michele, Roberto, Jonathan, and many others
+- 2.6,3 specifically fixed a possible DoS vulnerability
+- 2.6.4 specifically fixes major problem introduced in 2.6.1 with session logic
+
+## 2.5.2
+
+- Web editor with tabs, thanks ilvalle
+
+## 2.5.1
+
+- New style virtual fields in grid
+- Conditional fields (experimental) ``db.table.field.show_if = db.table.otherfield==True`` or ``db.table.field.show_if = db.table.otherfiel.contains(values)``
+- auth.settings.manager_group_role="manager" enables http://.../app/appadmin/auth_manage and http://.../app/appadmin/manage for members of the "manager" group. (also experimental)
+- support for POST variables in DELETE
+- Fixed memory leak when using the TAG helper
+
+
+## 2.4.7
+
+- pypy support, thanks Niphlod
+- more bug fixes
+- ...
+
+## 2.4.6
+
+- better tests
+- new ANY_OF and IS_IPV6 validators
+- new custom save option
+- many small bug fixes
+
+## 2.4.5
+
+- travis.ci integration (thanks Marc Abramowitz and Niphlod). Passes all tests (thanks Niplod).
+- IS_DATE and IS_DATETIME can specify timezone
+
+## 2.4.1- 2.4.3
+
+- 2D GEO API: geoPoint, getLine, geoPolygon
+- support for 'json' field type in DAL
+- schema export with db.as_json/as_xml, thanks Alan
+- graph representation of models
+- support for semantic versioning
+- new bootstrap based admin, thanks Paolo
+- improved scheduler (and change in scheduler field names), thanks Niphlod
+- graphviz support added to adm, thanks Jose
+- on_failure in grid
+- db.table.field.abs()
+- better wiki
+- geoPoint, getLine, geoPolygon
+- better reporting of 500 ajax errors
+- better grid
+- improved/fixed mongodb support
+- improved parse_as_rest(patterns=...), thanks Denes
+- improved IMAP DAL support, thanks Alan
+- improved security when cookies in sessions
+- Row.as_xml, as_json, as_dict, as_yaml thanks Alan
+- smarter custom_import
+- setup-ubuntu-12-04-redmine-unicorn-web2py-uwsgi-nginx.sh
+- added support for motor and pulsar servers, thanks Niphlod
+- added json-rpc2 support
+- added pypyodbc.py driver
+- allow auth.settings.ondelete='CASCADE'
+- new syntax IS_EXPR(lambda value: ...
+- using google for QR codes (although Graph API will be deprecated in 2015)
+- upgraded fpdf to 1.7.1
+- bug fixes (including issues with calendar.js and archive tables)
+
+## 2.3.1 - 2.3.2
+
+- new virtual fields syntax:
+  ``db.define_table('person',Field('name'),Field.Virtual('namey',lambda row: row.person.name+'y'))``
+- db.thing(name='Cohen',_orderby=db.thing.name), thanks Yair
+- made many modules Python 3.3 friendly (compile but not tested)
+- better welcome css, thanks Paolo
+- jQuery 1.8.3
+- Bootstrap 2.2.2
+- Modernizr 2.6.2 (custom full options)
+- integration with analyitics.js (0.2.0)
+- better scheduler, thanks Niphlod
+- page and media preview in wiki, thanks Niphlod
+- create new auth.wiki page from slug model, thanks Nico
+- conditional menus with auth.wiki(menugroups=['wiki_editor'])
+- better security in grid/smartgrid
+- allow LOADing multiple grids, thanks Niphlod
+- auth.settings.login_onfail, thanks Yair
+- better handling of session files for speed
+- added heroku support (experimental)
+- added rocket support for IPV6, thanks Chirs Winebrinner
+- more customizable menus with MENU(li_first, li_last..)
+- added support for paymentech (gluon/contrib/paymentech.py)
+- fixed broken cron
+- fixed possible xss with share.js
+- many bug fixes. Closed more than 50 tickets since 2.2.1
+
+## 2.2.1
+
+- session.connect(cookie_key='secret', compression_level=9) stores sessions in cookies
+- T.is_writable = False prevents T from dynamically updating langauge files
+- all code is more PEP8 compliant
+- better custom_importer behaviour (now works per app, is smalled and faster)
+- fixed some bugs
+- upgraded feedparser.py and rss2.py
+- codemirror has autoresize
+
+## 2.1.0
+
+- overall faster web2py
+- when apps are deleted, a w2p copy is left in deposit folder
+- change in cron (it is now disabled by default). removed -N option and introduced -Y.
+- faster web2py_uuid() and request initialization logic, thanks Michele
+- static asset management, thanks Niphlod
+- improved mobile admin
+- request.requires_https and Auth(secure=True), thanks Yarin and Niphlod
+- better custom_import (works per app and is faster), thanks Michele
+- redis_sesssion.py, thanks Niphlod
+- allow entropy computation in IS_STRONG and web2py.js, thanks Jonathan and Niphlod
+- fixed many aith.wiki problems
+- support for auth.wiki(render='html')
+- better welcome layout, thanks Paolo
+- db.define_table(...,redefine=True)
+- DAL, Row, and Rows object can now be pickled/unpickled, thanks to zombie DAL.
+- admin uses codemirror
+- allow syntax auth = Auth(db).define_tables()
+- better auth.wiki with preview, thanks Alan
+- better auth.impersonate, thanks Alan
+- upgraded jQuery 1.8
+- upgraded Bootstrap 2.1
+- fixed problem with dropbox_account.py
+- many fixes to cache.ram, cache.disk, memcache and gae_memcache
+- cache.with_prefix(cache.ram,'prefix')
+- db.table.field.epoch() counts seconds from epoch
+- DAL support for SQL CASE, example: db().select(...query.case('true','false))
+- DAL(...,do_connect=False) allows faking connections
+- DAL(...,auto_import=True) now retieves some fiel attributes
+- mail can specify a sender: mail.send(...,sender='Mr X <%(sender)s>')
+- renamed gluon/contrib/comet_messaging.py -> gluon/contrib/websocket_messaging.py
+
+## 2.0.1-11

 ### DAL Improvements

@@ -23,6 +214,7 @@
 - Support for Google App Engine projections, thanks Christian
 - Field(... 'upload', default=path) now accepts a path to a local file as default value, if user does not upload a file. Relative path looks inside current application folder, thanks Marin
 - executesql(...,fields=,columns=) allows parsing of results in Rows, thanks Anthony
+- Rows.find(lambda row: bool(), limitby=(0,1))

 ### Auth improvements

@@ -49,7 +241,7 @@
 - increased security in admin against CSRF
 - experimental Git integration
 - experimental OpenShift deployment
- multi-language pluralization engine 
+- multi-language pluralization engine
 - ace text web editor in admin
 - Ukrainian translations, thanks Vladyslav Kozlovskyy
 - Romanian translation for welcome, thanks ionel
@@ -78,7 +270,7 @@
    TERMINATE (complete the current task and then die)
    KILL (kill ASAP)

-### Other Improvements 
+### Other Improvements

 - gluon/contrib/webclient.py makes it easy to create functional tests for app
 - DIV(..).elements(...replace=...), thanks Anthony
@@ -118,7 +310,7 @@
 - db = DAL('mongodb://127.0.0.1:5984/db') (experimental, thanks Mark Breedveld)
 - db = DAL('cubrid')  (experimental)
 - db = DAL('postgres:pg8000:...') and DAL('postgres:psycopg2:...')
- pg8000 now ships with web2py (thanks Mariano) 
+- pg8000 now ships with web2py (thanks Mariano)
 - reponse.delimiters = ('\\[','\\]') (thanks Denes)
 - auth.user_groups stores user groups
 - auth.is_impersonating()
@@ -143,7 +335,7 @@ fixed a SQLCustomField bug

 ## 1.99.3
 This is a major revision in peparation for web2py 2.0
- moved to GitHub and abandoned Lanchpad 
+- moved to GitHub and abandoned Lanchpad
 - new web site layout, thanks Anthony
 - new welcome app using skeleton, thanks Anthony
 - jQuery 1.7.1
@@ -248,7 +440,7 @@ This is a major revision in peparation for web2py 2.0
 ## 1.96.1

 - "from gluon import *" imports in every python module a web2py environment (A, DIV,..SQLFORM, DAL, Field,...) including current.request, current.response, current.session, current.T, current.cache, thanks Jonathan.
- conditional models in 
+- conditional models in
  models/<controller>/a.py and models/<controller>/<function>/a.py
 - from mymodule import *, looks for mymodule in applications/thisapp/modules first and then in sys.path. No more need for local_import. Thanks Pierre.
 - usage of generic.* views is - by default - restricted to localhost for security. This can be changed in a granular way with: response.generic_patterns=['*']. This is a slight change of behavior for new app but a major security fix.
@@ -280,7 +472,7 @@ This is a major revision in peparation for web2py 2.0
 - messages in validators have default internationalization
 - No more Auth(globals(),db), just Auth(db). Same for Crud and Service.
 - scripts/access.wsgi allows apache+mod_wsgi to delegate authentication of any URL to any web2py app
- json now supports T(...) 
+- json now supports T(...)
 - scripts/setup-web2py-nginx-uwsgi-ubuntu.sh
 - web2py HTTP responses now set: "X-Powered-By: web2py", thanks Bruno
 - mostly fixed generic.pdf. You can view any page in PDF if you have pdflatex installed or if your html follows the pyfpdf convention.
@@ -457,7 +649,7 @@ This is a major revision in peparation for web2py 2.0
 recalled

 ## 1.86.1-1.86.3
- markmin2latex 
+- markmin2latex
 - markmin2pdf
 - fixed some bugs
 - Storage getfirst, getlast, getall by Kevin and Nathan
@@ -487,7 +679,7 @@ recalled
 - Polymmodel support on GAE
 - Experimental ListWidget
 - moved DAL and routes to thread.local (thanks Jonathan, again)
- scripts/extract_mysql_models.py, thanks Falko Krause and Ron McOuat 
+- scripts/extract_mysql_models.py, thanks Falko Krause and Ron McOuat
 - scripts/dbsessions2trash.py, thanks Scott

 ## 1.83.2
@@ -589,7 +781,7 @@ recalled
 - automatic database retry connect when pooling and lost connections
 - OPTGROUP helper, thanks Iceberg
 - web2py_ajax_trap captures all form submissions, thank you Skiros
- multicolumn checkwidget and arbitrary chars in multiple is_in_set, thanks hy 
+- multicolumn checkwidget and arbitrary chars in multiple is_in_set, thanks hy
 - Québécois for welcome, thanks Chris
 - crud.search(), thanks Mr Freeze
 - DAL(...migrate,fake_migrate), thanks Thadeus
@@ -637,7 +829,7 @@ recalled
 - fix in delete for GAE
 - auth.settings.login_captcha and auth.settings.register_captcha
 - crud.settings.create_captcha and  crud.settings.update_captcha
- automatic update button in admin 
+- automatic update button in admin

 ## 1.76.1
 - editarea 0.8.2 + zencoding
@@ -731,7 +923,7 @@ recalled
 - New get_vars and post_vars compatible in 2.5 and 2.6 (thanks Tim)
 - Major rewrite of gql.py extends DAL syntax on GAE
 - No more *.w2p, welcome.w2p is create automatically, base apps are always upgraded
- export_to_csv(delimiter = ',', quotechar = '"', quoting = csv.QUOTE_MINIMAL), thanks Thadeus 
+- export_to_csv(delimiter = ',', quotechar = '"', quoting = csv.QUOTE_MINIMAL), thanks Thadeus

 ## 1.73.1
 - Fixed problem with storage and comparison of Row objects
@@ -942,7 +1134,7 @@ recalled
 - fixing lots of small bugs with tool and languages
 - jquery.1.3.2

-## 
+##

 - One more feature in trunk....

@@ -976,7 +1168,7 @@ recalled
 - passes all unittest but test_rewite (not sure it should pass that one)

 - Lots of patches from Fran Boone (about tools) and Dougla Soares de Andarde (Python 2.6 compliance, user use of hashlib instead of md5, new markdown2.py)
- db.define_table('mytable',db.Field('somefield'),timestamp) 
+- db.define_table('mytable',db.Field('somefield'),timestamp)
 Example:
 ``
 timestamp=SQLTable(None,'timestamp',
@@ -1145,7 +1337,7 @@ db.define_table('cirlce',
 - fixed a bug in sql belongs

 ## web2py 1.20
- new IFRAME, LABEL, FIELDSET validators 
+- new IFRAME, LABEL, FIELDSET validators
 - P(..cr2br=True) option
 - FORM and SQLFORM have hidden=dict(...) option for REST
 - testing framework.
@@ -1179,7 +1371,7 @@ db.define_table('cirlce',
 - Although we are not infringing the trademark since this is a non-commercial
 - product we could have run into some issues. So we have been professional
 - and changed the name to web2py.
- Now SQLFORMs and FORM can have a formname and multiple forms are allowed 
+- Now SQLFORMs and FORM can have a formname and multiple forms are allowed
 - per page.
 - A new examples/default/index page.
 - web2py.py instead of runme.py
@@ -1207,7 +1399,7 @@ db.define_table('cirlce',
 - New applications/examples/controller/global.py controller for docs.

 ## Gluon v1.12
- in sql.py 
+- in sql.py
 - handles NULL values properly
 - unicode support (data always stored in utf-8)
 - 'date' -> datetime.date ,'time' -> datetime.time, 'datetime' -> datetime.datetime, 'boolean' -> True/False
@@ -1273,7 +1465,7 @@ db.define_table('cirlce',
 - bug in sqlhtml with JOINS queries

 ## EWF v1.7 -> Gluon v1.0
- Name change 
+- Name change
 - Improved layout.html

 ## EWF v1.6 -> v1.7
@@ -1284,4 +1476,3 @@ db.define_table('cirlce',
 ## EWF v1.5 -> v1.6  (2007)
 - load and save .py in ascii, avoids problem with LF+CR on windows
 - added path.join in compileapp, fixed problem with Windows compileapp
-
--- a/2
+++ b/2
@@ -3,7 +3,7 @@
 Web2py is Licensed under the LGPL license version 3 
 (http://www.gnu.org/licenses/lgpl.html)

-Copyrighted (c) by Massimo Di Pierro (2007-2011)
+Copyrighted (c) by Massimo Di Pierro (2007-2013)

 ### On Commercial Redistribution

--- a/80
+++ b/80
@@ -1,11 +1,11 @@
 all:
-	echo "The Makefile is used to build the distribution."
-	echo "In order to run web2py you do not need to make anything."
-	echo "just run web2py.py"
+	@echo "The Makefile is used to build the distribution."
+	@echo "In order to run web2py you do not need to make anything."
+	@echo "just run web2py.py"
 clean:
 	rm -f httpserver.log 
 	rm -f parameters*.py 
-	rm -f -r applications/*/compiled     	
+	rm -f -r applications/*/compiled
 	find ./ -name '*~' -exec rm -f {} \; 
 	find ./ -name '*.orig' -exec rm -f {} \; 
 	find ./ -name '*.rej' -exec rm -f {} \; 
@@ -20,7 +20,7 @@ clean:
 epydoc:
 	### build epydoc
 	rm -f -r applications/examples/static/epydoc/ 
-	epydoc --config epydoc.conf
+	epydoc --config extras/epydoc/epydoc.conf
 	cp applications/examples/static/title.png applications/examples/static/epydoc
 tests:
 	python web2py.py --run_system_tests
@@ -29,20 +29,23 @@ update:
 	wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
 	echo "remember that pymysql was tweaked"
 src:
-	echo 'Version 2.0.2 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
+	### Use semantic versioning
+	echo 'Version 2.7.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/*/sessions/*
 	rm -f applications/*/errors/* | echo 'too many files'
-	rm -f applications/*/cache/*                  
+	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/*             
+	rm -f applications/examples/uploads/* 
+	### make epydoc
+	make epydoc
 	### 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
@@ -51,43 +54,39 @@ 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/gluon/*.py web2py/gluon/contrib/* web2py/splashlogo.gif web2py/*.py web2py/README.markdown  web2py/LICENSE web2py/CHANGELOG web2py/NEWINSTALL web2py/VERSION web2py/Makefile web2py/epydoc.css web2py/epydoc.conf web2py/app.example.yaml web2py/logging.example.conf web2py_exe.conf web2py/queue.example.yaml MANIFEST.in w2p_apps w2p_clone w2p_run startweb2py 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/*.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

 mdp:
-	make epydoc
 	make src
 	make app
 	make win
 app:
-	echo 'did you uncomment import_all in gluon/main.py?'
-	python2.5 -c 'import compileall; compileall.compile_dir("gluon/")'
+	python2.7 -c 'import compileall; compileall.compile_dir("gluon/")'
 	#python web2py.py -S welcome -R __exit__.py
 	#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.5
+	#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 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
 	cp VERSION ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp CHANGELOG ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp splashlogo.gif ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp options_std.py ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp routes.example.py ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp router.example.py ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp app.example.yaml ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp queue.example.yaml ../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
 	cp applications/__init__.py ../web2py_osx/web2py/web2py.app/Contents/Resources/applications
 	cd ../web2py_osx; zip -r web2py_osx.zip web2py
+		
 	mv ../web2py_osx/web2py_osx.zip .
 win:
-	echo 'did you uncomment import_all in gluon/main.py?'
 	python2.7 -c 'import compileall; compileall.compile_dir("gluon/")'
 	#cd ../web2py_win/library/; unzip ../library.zip
-	find gluon -path '*.pyc' -exec cp {} ../web2py_win/library/{} \;
+	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
 	cp README.markdown ../web2py_win/web2py/
@@ -95,37 +94,36 @@ win:
 	cp LICENSE ../web2py_win/web2py/
 	cp VERSION ../web2py_win/web2py/
 	cp CHANGELOG ../web2py_win/web2py/
-	cp splashlogo.gif ../web2py_win/web2py/
-	cp options_std.py ../web2py_win/web2py/
-	cp routes.example.py ../web2py_win/web2py/
-	cp router.example.py ../web2py_win/web2py/
-	cp app.example.yaml ../web2py_win/web2py/
-	cp queue.example.yaml ../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 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 applications/__init__.py ../web2py_win/web2py/applications
 	cd ../web2py_win; zip -r web2py_win.zip web2py
 	mv ../web2py_win/web2py_win.zip .
-pip:
-	# create Web2py distribution for upload to Pypi
-	# after upload clean Web2py sources with rm -R ./dist
-	python setup.py sdist
 run:
-	python2.5 web2py.py -a hello
+	python2.7 web2py.py -a hello
 commit:
 	python web2py.py --run_system_tests
 	make src
 	echo '' > NEWINSTALL
 	hg commit -m "$(S)"
-	#bzr commit -m "$(S)"
 	git commit -a -m "$(S)"
 push:
 	hg push
 	git push
-	git push mdipierro
+	git push --tags
 tag:
 	git tag -l '$(S)'
 	hg tag -l '$(S)'
-	make commit
+	make commit S='$(S)'
 	make push
+pip:
+	# create Web2py distribution for upload to Pypi
+	# after upload clean Web2py sources with rm -R ./dist
+	# http://guide.python-distribute.org/creation.html
+	python setup.py sdist
+	sudo python setup.py register
+	sudo python setup.py sdist upload
--- a/README.markdown
+++ b/README.markdown
@@ -6,6 +6,13 @@ It is written and programmable in Python. LGPLv3 License

 Learn more at http://web2py.com

+
+## Tests
+
+[![Build Status](https://travis-ci.org/web2py/web2py.png)](https://travis-ci.org/web2py/web2py)
+
+[![Coverage Status](https://coveralls.io/repos/web2py/web2py/badge.png)](https://coveralls.io/r/web2py/web2py)
+
 ## Installation Instructions

 To start web2py there is NO NEED to install it. Just unzip and do:
@@ -26,9 +33,9 @@ That's it!!!
        ...                        > other handlers and example files
        gluon/                     > the core libraries
            contrib/               > third party libraries
-            tests/                 > unittests
+            tests/                 > unittests	
        applications/              > are the apps
-	    admin/                 > web based IDE
+            admin/                 > web based IDE
                ...
            examples/              > examples, docs, links
                ...
@@ -47,9 +54,12 @@ That's it!!!
                cron/
                tests/
            ...                    > your own apps
+        examples/                  > example config files, mv .. and customize
+        extras/                    > other files which are required for building web2py
        scripts/                   > utility and installation scripts
        site-packages/             > additional optional modules
-
+        logs/                      > log files will go in there
+        deposit/                   > a place where web2py stores apps temporarily

 ## Issues?

--- a/2
+++ b/2
@@ -1 +1 @@
-Version 2.0.2 (2012-08-29 22:00:56) stable
+Version 2.7.1-stable+timestamp.2013.10.04.15.14.09
--- a/init.py
+++ b/init.py
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
--- a/anyserver.py
+++ b/anyserver.py
@@ -9,47 +9,52 @@ License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html)
 This file is based, although a rewrite, on MIT-licensed code from the Bottle web framework.
 """

-import os, sys, optparse, urllib
+import os
+import sys
+import optparse
+import urllib
+
 path = os.path.dirname(os.path.abspath(__file__))
 os.chdir(path)
-sys.path = [path]+[p for p in sys.path if not p==path]
-import gluon.main
-from gluon.fileutils import read_file, write_file
+sys.path = [path] + [p for p in sys.path if not p == path]
+

 class Servers:
    @staticmethod
    def cgi(app, address=None, **options):
        from wsgiref.handlers import CGIHandler
-        CGIHandler().run(app) # Just ignore host and port here
+        CGIHandler().run(app)  # Just ignore host and port here

    @staticmethod
-    def flup(app,address, **options):
+    def flup(app, address, **options):
        import flup.server.fcgi
        flup.server.fcgi.WSGIServer(app, bindAddress=address).run()

    @staticmethod
-    def wsgiref(app,address,**options): # pragma: no cover
+    def wsgiref(app, address, **options):  # pragma: no cover
        from wsgiref.simple_server import make_server, WSGIRequestHandler
+
        class QuietHandler(WSGIRequestHandler):
-            def log_request(*args, **kw): pass
+            def log_request(*args, **kw):
+                pass
        options['handler_class'] = QuietHandler
-        srv = make_server(address[0],address[1],app,**options)
+        srv = make_server(address[0], address[1], app, **options)
        srv.serve_forever()

    @staticmethod
-    def cherrypy(app,address, **options):
+    def cherrypy(app, address, **options):
        from cherrypy import wsgiserver
        server = wsgiserver.CherryPyWSGIServer(address, app)
        server.start()

    @staticmethod
-    def rocket(app,address, **options):
+    def rocket(app, address, **options):
        from gluon.rocket import CherryPyWSGIServer
        server = CherryPyWSGIServer(address, app)
        server.start()

    @staticmethod
-    def rocket_with_repoze_profiler(app,address, **options):
+    def rocket_with_repoze_profiler(app, address, **options):
        from gluon.rocket import CherryPyWSGIServer
        from repoze.profile.profiler import AccumulatingProfileMiddleware
        from gluon.settings import global_settings
@@ -59,44 +64,44 @@ class Servers:
            log_filename='wsgi.prof',
            discard_first_request=True,
            flush_at_shutdown=True,
-            path = '/__profile__'
-            )
+            path='/__profile__'
+        )
        server = CherryPyWSGIServer(address, wrapped)
        server.start()

    @staticmethod
-    def paste(app,address,**options):
+    def paste(app, address, **options):
        from paste import httpserver
        from paste.translogger import TransLogger
        httpserver.serve(app, host=address[0], port=address[1], **options)

    @staticmethod
-    def fapws(app,address, **options):
+    def fapws(app, address, **options):
        import fapws._evwsgi as evwsgi
        from fapws import base
-        evwsgi.start(address[0],str(address[1]))
+        evwsgi.start(address[0], str(address[1]))
        evwsgi.set_base_module(base)
+
        def app(environ, start_response):
            environ['wsgi.multiprocess'] = False
            return app(environ, start_response)
-        evwsgi.wsgi_cb(('',app))
+        evwsgi.wsgi_cb(('', app))
        evwsgi.run()

-
    @staticmethod
-    def gevent(app,address, **options):
-        from gevent import monkey; monkey.patch_all()
+    def gevent(app, address, **options):
        from gevent import pywsgi
        from gevent.pool import Pool
-        pywsgi.WSGIServer(address, app, spawn = 'workers' in options and Pool(int(options.workers)) or 'default').serve_forever()
+        pywsgi.WSGIServer(address, app, spawn='workers' in options and Pool(
+            int(options.workers)) or 'default').serve_forever()

    @staticmethod
-    def bjoern(app,address, **options):
+    def bjoern(app, address, **options):
        import bjoern
        bjoern.run(app, *address)

    @staticmethod
-    def tornado(app,address, **options):
+    def tornado(app, address, **options):
        import tornado.wsgi
        import tornado.httpserver
        import tornado.ioloop
@@ -106,7 +111,7 @@ class Servers:
        tornado.ioloop.IOLoop.instance().start()

    @staticmethod
-    def twisted(app,address, **options):
+    def twisted(app, address, **options):
        from twisted.web import server, wsgi
        from twisted.python.threadpool import ThreadPool
        from twisted.internet import reactor
@@ -118,54 +123,82 @@ class Servers:
        reactor.run()

    @staticmethod
-    def diesel(app,address, **options):
+    def diesel(app, address, **options):
        from diesel.protocols.wsgi import WSGIApplication
        app = WSGIApplication(app, port=address[1])
        app.run()

    @staticmethod
-    def gunicorn(app,address, **options):
+    def gunicorn(app, address, **options):
        from gunicorn.app.base import Application
        config = {'bind': "%s:%d" % address}
        config.update(options)
        sys.argv = ['anyserver.py']
+
        class GunicornApplication(Application):
            def init(self, parser, opts, args):
                return config
+
            def load(self):
                return app
        g = GunicornApplication()
        g.run()

    @staticmethod
-    def eventlet(app,address, **options):
+    def eventlet(app, address, **options):
        from eventlet import wsgi, listen
        wsgi.server(listen(address), app)

    @staticmethod
-    def mongrel2(app,address,**options):
+    def mongrel2(app, address, **options):
        import uuid
        sys.path.append(os.path.abspath(os.path.dirname(__file__)))
        from mongrel2 import handler
        conn = handler.Connection(str(uuid.uuid4()),
                                  "tcp://127.0.0.1:9997",
                                  "tcp://127.0.0.1:9996")
-        mongrel2_handler(app,conn,debug=False)
+        mongrel2_handler(app, conn, debug=False)

+    @staticmethod
+    def motor(app, address, **options):
+        #https://github.com/rpedroso/motor
+        import motor
+        app = motor.WSGIContainer(app)
+        http_server = motor.HTTPServer(app)
+        http_server.listen(address=address[0], port=address[1])
+        #http_server.start(2)
+        motor.IOLoop.instance().start()
+
+    @staticmethod
+    def pulsar(app, address, **options):
+        from pulsar.apps import wsgi
+        sys.argv = ['anyserver.py']
+        s = wsgi.WSGIServer(callable=app, bind="%s:%d" % address)
+        s.start()
+
+def run(servername, ip, port, softcron=True, logging=False, profiler=None):
+    if servername == 'gevent':
+        from gevent import monkey
+        monkey.patch_all()
+    elif servername == 'eventlet':
+        import eventlet
+        eventlet.monkey_patch()
+
+    import gluon.main

-def run(servername,ip,port,softcron=True,logging=False,profiler=None):
    if logging:
        application = gluon.main.appfactory(wsgiapp=gluon.main.wsgibase,
                                            logfilename='httpserver.log',
-                                            profilerfilename=profiler)
+                                            profiler_dir=profiler)
    else:
        application = gluon.main.wsgibase
    if softcron:
        from gluon.settings import global_settings
        global_settings.web2py_crontype = 'soft'
-    getattr(Servers,servername)(application,(ip,int(port)))
+    getattr(Servers, servername)(application, (ip, int(port)))

-def mongrel2_handler(application,conn,debug=False):
+
+def mongrel2_handler(application, conn, debug=False):
    """
    Based on :
    https://github.com/berry/Mongrel2-WSGI-Handler/blob/master/wsgi-handler.py
@@ -190,20 +223,23 @@ def mongrel2_handler(application,conn,debug=False):
    # and responses. Unless I have missed something.

    while True:
-        if debug: print "WAITING FOR REQUEST"
+        if debug:
+            print "WAITING FOR REQUEST"

        # receive a request
        req = conn.recv()
-        if debug: print "REQUEST BODY: %r\n" % req.body
+        if debug:
+            print "REQUEST BODY: %r\n" % req.body

        if req.is_disconnect():
-            if debug: print "DISCONNECT"
-            continue #effectively ignore the disconnect from the client
+            if debug:
+                print "DISCONNECT"
+            continue  # effectively ignore the disconnect from the client

        # Set a couple of environment attributes a.k.a. header attributes
        # that are a must according to PEP 333
        environ = req.headers
-        environ['SERVER_PROTOCOL'] = 'HTTP/1.1' # SimpleHandler expects a server_protocol, lets assume it is HTTP 1.1
+        environ['SERVER_PROTOCOL'] = 'HTTP/1.1'  # SimpleHandler expects a server_protocol, lets assume it is HTTP 1.1
        environ['REQUEST_METHOD'] = environ['METHOD']
        if ':' in environ['Host']:
            environ['SERVER_NAME'] = environ['Host'].split(':')[0]
@@ -211,17 +247,19 @@ def mongrel2_handler(application,conn,debug=False):
        else:
            environ['SERVER_NAME'] = environ['Host']
            environ['SERVER_PORT'] = ''
-        environ['SCRIPT_NAME'] = '' # empty for now
+        environ['SCRIPT_NAME'] = ''  # empty for now
        environ['PATH_INFO'] = urllib.unquote(environ['PATH'])
        if '?' in environ['URI']:
            environ['QUERY_STRING'] = environ['URI'].split('?')[1]
        else:
            environ['QUERY_STRING'] = ''
-        if environ.has_key('Content-Length'):
-            environ['CONTENT_LENGTH'] = environ['Content-Length'] # necessary for POST to work with Django
+        if 'Content-Length' in environ:
+            environ['CONTENT_LENGTH'] = environ[
+                'Content-Length']  # necessary for POST to work with Django
        environ['wsgi.input'] = req.body

-        if debug: print "ENVIRON: %r\n" % environ
+        if debug:
+            print "ENVIRON: %r\n" % environ

        # SimpleHandler needs file-like stream objects for
        # requests, errors and responses
@@ -230,7 +268,8 @@ def mongrel2_handler(application,conn,debug=False):
        respIO = StringIO.StringIO()

        # execute the application
-        handler = SimpleHandler(reqIO, respIO, errIO, environ, multithread = False, multiprocess = False)
+        handler = SimpleHandler(reqIO, respIO, errIO, environ,
+                                multithread=False, multiprocess=False)
        handler.run(application)

        # Get the response and filter out the response (=data) itself,
@@ -254,16 +293,20 @@ def mongrel2_handler(application,conn,debug=False):
        errors = errIO.getvalue()

        # return the response
-        if debug: print "RESPONSE: %r\n" % response
+        if debug:
+            print "RESPONSE: %r\n" % response
        if errors:
-            if debug: print "ERRORS: %r" % errors
+            if debug:
+                print "ERRORS: %r" % errors
            data = "%s\r\n\r\n%s" % (data, errors)
-        conn.reply_http(req, data, code = code, status = status, headers = headers)
+        conn.reply_http(
+            req, data, code=code, status=status, headers=headers)
+

 def main():
    usage = "python anyserver.py -s tornado -i 127.0.0.1 -p 8000 -l -P"
    try:
-        version = read_file('VERSION')
+        version = open('VERSION','r')
    except IOError:
        version = ''
    parser = optparse.OptionParser(usage, None, optparse.Option, version)
@@ -276,9 +319,9 @@ def main():
    parser.add_option('-P',
                      '--profiler',
                      default=False,
-                      dest='profiler',
-                      help='profiler filename')
-    servers = ', '.join(x for x in dir(Servers) if not x[0]=='_')
+                      dest='profiler_dir',
+                      help='profiler dir')
+    servers = ', '.join(x for x in dir(Servers) if not x[0] == '_')
    parser.add_option('-s',
                      '--server',
                      default='rocket',
@@ -300,13 +343,10 @@ def main():
                      dest='workers',
                      help='number of workers number')
    (options, args) = parser.parse_args()
-    print 'starting %s on %s:%s...' % (options.server,options.ip,options.port)
-    run(options.server,options.ip,options.port,logging=options.logging,profiler=options.profiler)
+    print 'starting %s on %s:%s...' % (
+        options.server, options.ip, options.port)
+    run(options.server, options.ip, options.port,
+        logging=options.logging, profiler=options.profiler_dir)

-if __name__=='__main__':
+if __name__ == '__main__':
    main()
-
-
-
-
-
--- a/applications/init.py
+++ b/applications/init.py
@@ -0,0 +1 @@
+
--- a/applications/admin/init.py
+++ b/applications/admin/init.py
@@ -0,0 +1 @@
+
--- a/applications/admin/controllers/appadmin.py
+++ b/applications/admin/controllers/appadmin.py
@@ -11,7 +11,10 @@ import copy
 import gluon.contenttype
 import gluon.fileutils

-response.subtitle = 'Database Administration (appadmin)'
+try:
+    import pygraphviz as pgv
+except ImportError:
+    pgv = None

 # ## critical --- make a copy of the environment

@@ -23,23 +26,41 @@ remote_addr = request.env.remote_addr
 try:
    hosts = (http_host, socket.gethostname(),
             socket.gethostbyname(http_host),
-             '::1','127.0.0.1','::ffff:127.0.0.1')
+             '::1', '127.0.0.1', '::ffff:127.0.0.1')
 except:
    hosts = (http_host, )

 if request.env.http_x_forwarded_for or request.is_https:
    session.secure()
-elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"):
+elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1") and \
+    (request.function != 'manage'):
    raise HTTP(200, T('appadmin is disabled because insecure channel'))

-if (request.application=='admin' and not session.authorized) or \
-        (request.application!='admin' and not gluon.fileutils.check_credentials(request)):
+if request.function == 'manage':
+    if not 'auth' in globals() or not request.args:
+        redirect(URL(request.controller, 'index'))
+    manager_action = auth.settings.manager_actions.get(request.args(0), None)
+    if manager_action is None and request.args(0) == 'auth':
+        manager_action = dict(role=auth.settings.auth_manager_role,
+                              heading=T('Manage Access Control'),
+                              tables=[auth.table_user(),
+                                      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)()
+    menu = False
+elif (request.application == 'admin' and not session.authorized) or \
+        (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
    redirect(URL('admin', 'default', 'index',
-                 vars=dict(send=URL(args=request.args,vars=request.vars))))
+                 vars=dict(send=URL(args=request.args, vars=request.vars))))
+else:
+    response.subtitle = T('Database Administration (appadmin)')
+    menu = True

 ignore_rw = True
 response.view = 'appadmin.html'
-response.menu = [[T('design'), False, URL('admin', 'default', 'design',
+if menu:
+    response.menu = [[T('design'), False, URL('admin', 'default', 'design',
                 args=[request.application])], [T('db'), False,
                 URL('index')], [T('state'), False,
                 URL('state')], [T('cache'), False,
@@ -49,6 +70,10 @@ response.menu = [[T('design'), False, URL('admin', 'default', 'design',
 # ## auxiliary functions
 # ###########################################################

+if False and request.tickets_db:
+    from gluon.restricted import TicketStorage
+    ts = TicketStorage()
+    ts._get_table(request.tickets_db, ts.tablename, request.application)

 def get_databases(request):
    dbs = {}
@@ -95,25 +120,23 @@ def get_query(request):
        return None


-def query_by_table_type(tablename,db,request=request):
-    keyed = hasattr(db[tablename],'_primarykey')
+def query_by_table_type(tablename, db, request=request):
+    keyed = hasattr(db[tablename], '_primarykey')
    if keyed:
        firstkey = db[tablename][db[tablename]._primarykey[0]]
        cond = '>0'
        if firstkey.type in ['string', 'text']:
            cond = '!=""'
-        qry = '%s.%s.%s%s' % (request.args[0], request.args[1], firstkey.name, cond)
+        qry = '%s.%s.%s%s' % (
+            request.args[0], request.args[1], firstkey.name, cond)
    else:
        qry = '%s.%s.id>0' % tuple(request.args[:2])
    return qry


-
 # ##########################################################
 # ## list all databases and tables
 # ###########################################################
-
-
 def index():
    return dict(databases=databases)

@@ -128,7 +151,7 @@ def insert():
    form = SQLFORM(db[table], ignore_rw=ignore_rw)
    if form.accepts(request.vars, session):
        response.flash = T('new record inserted')
-    return dict(form=form,table=db[table])
+    return dict(form=form, table=db[table])


 # ##########################################################
@@ -139,7 +162,8 @@ def insert():
 def download():
    import os
    db = get_database(request)
-    return response.download(request,db)
+    return response.download(request, db)
+

 def csv():
    import gluon.contenttype
@@ -150,26 +174,27 @@ def csv():
    if not query:
        return None
    response.headers['Content-disposition'] = 'attachment; filename=%s_%s.csv'\
-         % tuple(request.vars.query.split('.')[:2])
-    return str(db(query,ignore_common_filters=True).select())
+        % tuple(request.vars.query.split('.')[:2])
+    return str(db(query, ignore_common_filters=True).select())


 def import_csv(table, file):
    table.import_from_csv_file(file)

+
 def select():
    import re
    db = get_database(request)
    dbname = request.args[0]
    regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
-    if len(request.args)>1 and hasattr(db[request.args[1]],'_primarykey'):
+    if len(request.args) > 1 and hasattr(db[request.args[1]], '_primarykey'):
        regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
    if request.vars.query:
        match = regex.match(request.vars.query)
        if match:
            request.vars.query = '%s.%s.%s==%s' % (request.args[0],
-                    match.group('table'), match.group('field'),
-                    match.group('value'))
+                                                   match.group('table'), match.group('field'),
+                                                   match.group('value'))
    else:
        request.vars.query = session.last_query
    query = get_query(request)
@@ -193,14 +218,17 @@ def select():
    session.last_query = request.vars.query
    form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
                _name='query', _value=request.vars.query or '',
-                requires=IS_NOT_EMPTY(error_message=T("Cannot be empty")))), TR(T('Update:'),
+                requires=IS_NOT_EMPTY(
+                    error_message=T("Cannot be empty")))), TR(T('Update:'),
                INPUT(_name='update_check', _type='checkbox',
                value=False), INPUT(_style='width:400px',
                _name='update_fields', _value=request.vars.update_fields
-                 or '')), TR(T('Delete:'), INPUT(_name='delete_check',
+                                    or '')), TR(T('Delete:'), INPUT(_name='delete_check',
                _class='delete', _type='checkbox', value=False), ''),
                TR('', '', INPUT(_type='submit', _value=T('submit')))),
-                _action=URL(r=request,args=request.args))
+                _action=URL(r=request, args=request.args))
+
+    tb = None
    if form.accepts(request.vars, formname=None):
        regex = re.compile(request.args[0] + '\.(?P<table>\w+)\..+')
        match = regex.match(form.vars.query.strip())
@@ -210,26 +238,30 @@ def select():
            nrows = db(query).count()
            if form.vars.update_check and form.vars.update_fields:
                db(query).update(**eval_in_global_env('dict(%s)'
-                                  % form.vars.update_fields))
+                                                      % form.vars.update_fields))
                response.flash = T('%s %%{row} updated', nrows)
            elif form.vars.delete_check:
                db(query).delete()
                response.flash = T('%s %%{row} deleted', nrows)
            nrows = db(query).count()
            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(limitby=(
+                    start, stop), orderby=eval_in_global_env(orderby))
            else:
-                rows = db(query,ignore_common_filters=True).select(limitby=(start, stop))
+                rows = db(query, ignore_common_filters=True).select(
+                    limitby=(start, stop))
        except Exception, e:
+            import traceback
+            tb = traceback.format_exc()
            (rows, nrows) = ([], 0)
-            response.flash = DIV(T('Invalid Query'),PRE(str(e)))
+            response.flash = DIV(T('Invalid Query'), PRE(str(e)))
    # begin handle upload csv
    csv_table = table or request.vars.table
    if csv_table:
-        formcsv = FORM(str(T('or import from csv file'))+" ",
-                       INPUT(_type='file',_name='csvfile'),
-                       INPUT(_type='hidden',_value=csv_table,_name='table'),
-                       INPUT(_type='submit',_value=T('import')))
+        formcsv = FORM(str(T('or import from csv file')) + " ",
+                       INPUT(_type='file', _name='csvfile'),
+                       INPUT(_type='hidden', _value=csv_table, _name='table'),
+                       INPUT(_type='submit', _value=T('import')))
    else:
        formcsv = None
    if formcsv and formcsv.process().accepted:
@@ -238,7 +270,7 @@ def select():
                       request.vars.csvfile.file)
            response.flash = T('data uploaded')
        except Exception, e:
-            response.flash = DIV(T('unable to parse csv file'),PRE(str(e)))
+            response.flash = DIV(T('unable to parse csv file'), PRE(str(e)))
    # end handle upload csv

    return dict(
@@ -249,8 +281,9 @@ def select():
        nrows=nrows,
        rows=rows,
        query=request.vars.query,
-        formcsv = formcsv,
-        )
+        formcsv=formcsv,
+        tb=tb,
+    )


 # ##########################################################
@@ -260,14 +293,17 @@ def select():

 def update():
    (db, table) = get_table(request)
-    keyed = hasattr(db[table],'_primarykey')
+    keyed = hasattr(db[table], '_primarykey')
    record = None
+    db[table]._common_filter = None
    if keyed:
        key = [f for f in request.vars if f in db[table]._primarykey]
        if key:
-            record = db(db[table][key[0]] == request.vars[key[0]], ignore_common_filters=True).select().first()
+            record = db(db[table][key[0]] == request.vars[key[
+                        0]]).select().first()
    else:
-        record = db(db[table].id == request.args(2),ignore_common_filters=True).select().first()
+        record = db(db[table].id == request.args(
+            2)).select().first()

    if not record:
        qry = query_by_table_type(table, db)
@@ -277,20 +313,21 @@ def update():

    if keyed:
        for k in db[table]._primarykey:
-            db[table][k].writable=False
+            db[table][k].writable = False

-    form = SQLFORM(db[table], record, deletable=True, delete_label=T('Check to delete'),
-                   ignore_rw=ignore_rw and not keyed,
-                   linkto=URL('select',
+    form = SQLFORM(
+        db[table], record, deletable=True, delete_label=T('Check to delete'),
+        ignore_rw=ignore_rw and not keyed,
+        linkto=URL('select',
                   args=request.args[:1]), upload=URL(r=request,
-                   f='download', args=request.args[:1]))
+                                                      f='download', args=request.args[:1]))

    if form.accepts(request.vars, session):
        session.flash = T('done!')
        qry = query_by_table_type(table, db)
        redirect(URL('select', args=request.args[:1],
                 vars=dict(query=qry)))
-    return dict(form=form,table=db[table])
+    return dict(form=form, table=db[table])


 # ##########################################################
@@ -301,11 +338,18 @@ def update():
 def state():
    return dict()

+
 def ccache():
+    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")),
+        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):
@@ -329,11 +373,16 @@ def ccache():
        redirect(URL(r=request))

    try:
-        from guppy import hpy; hp=hpy()
+        from guppy import hpy
+        hp = hpy()
    except ImportError:
        hp = False

-    import shelve, os, copy, time, math
+    import shelve
+    import os
+    import copy
+    import time
+    import math
    from gluon import portalocker

    ram = {
@@ -360,7 +409,7 @@ def ccache():

        return (hours, minutes, seconds)

-    for key, value in cache.ram.storage.items():
+    for key, value in cache.ram.storage.iteritems():
        if isinstance(value, dict):
            ram['hits'] = value['hit_total'] - value['misses']
            ram['misses'] = value['misses']
@@ -376,11 +425,13 @@ def ccache():
            if value[0] < ram['oldest']:
                ram['oldest'] = value[0]
            ram['keys'].append((key, GetInHMS(time.time() - value[0])))
-
-    locker = open(os.path.join(request.folder,
-                                        'cache/cache.lock'), 'a')
+    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(request.folder, 'cache/cache.shelve'))
+    disk_storage = shelve.open(
+        os.path.join(folder, 'cache.shelve'))
    try:
        for key, value in disk_storage.items():
            if isinstance(value, dict):
@@ -411,7 +462,8 @@ def ccache():
    total['misses'] = ram['misses'] + disk['misses']
    total['keys'] = ram['keys'] + disk['keys']
    try:
-        total['ratio'] = total['hits'] * 100 / (total['hits'] + total['misses'])
+        total['ratio'] = total['hits'] * 100 / (total['hits'] +
+                                                total['misses'])
    except (KeyError, ZeroDivisionError):
        total['ratio'] = 0

@@ -439,4 +491,143 @@ def ccache():
                ram=ram, disk=disk, object_stats=hp != False)


+def table_template(table):
+    from gluon.html import TR, TD, TABLE, TAG

+    def FONT(*args, **kwargs):
+        return TAG.font(*args, **kwargs)
+
+    def types(field):
+        f_type = field.type
+        if not isinstance(f_type,str):
+            return ' '
+        elif f_type == 'string':
+            return field.length
+        elif f_type == 'id':
+            return B('pk')
+        elif f_type.startswith('reference') or \
+                f_type.startswith('list:reference'):
+            return B('fk')
+        else:
+            return ' '
+
+    # This is horribe HTML but the only one graphiz understands
+    rows = []
+    cellpadding = 4
+    color = "#000000"
+    bgcolor = "#FFFFFF"
+    face = "Helvetica"
+    face_bold = "Helvetica Bold"
+    border = 0
+
+    rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor),
+                           _colspan=3, _cellpadding=cellpadding,
+                           _align="center", _bgcolor=color)))
+    for row in db[table]:
+        rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold),
+                              _align="left", _cellpadding=cellpadding,
+                              _border=border),
+                       TD(FONT(row.type, _color=color, _face=face),
+                               _align="left", _cellpadding=cellpadding,
+                               _border=border),
+                       TD(FONT(types(row), _color=color, _face=face),
+                               _align="center", _cellpadding=cellpadding,
+                               _border=border)))
+    return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
+                                          _cellborder=0, _cellspacing=0)
+                             ).xml()
+
+
+def bg_graph_model():
+    graph = pgv.AGraph(layout='dot',  directed=True,  strict=False,  rankdir='LR')
+
+    subgraphs = dict()
+    for tablename in db.tables:
+        if hasattr(db[tablename],'_meta_graphmodel'):
+            meta_graphmodel = db[tablename]._meta_graphmodel
+        else:
+            meta_graphmodel = dict(group='Undefined', color='#ECECEC')
+
+        group = meta_graphmodel['group'].replace(' ', '')
+        if not subgraphs.has_key(group):
+            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
+            subgraphs[group]['tables'].append(tablename)
+        else:
+            subgraphs[group]['tables'].append(tablename)
+
+        graph.add_node(tablename, name=tablename, shape='plaintext',
+                       label=table_template(tablename))
+
+    for n, key in enumerate(subgraphs.iterkeys()):
+        graph.subgraph(nbunch=subgraphs[key]['tables'],
+                    name='cluster%d' % n,
+                    style='filled',
+                    color=subgraphs[key]['meta']['color'],
+                    label=subgraphs[key]['meta']['group'])
+
+    for tablename in db.tables:
+        for field in db[tablename]:
+            f_type = field.type
+            if isinstance(f_type,str) and (
+                f_type.startswith('reference') or
+                f_type.startswith('list:reference')):
+                referenced_table = f_type.split()[1].split('.')[0]
+                n1 = graph.get_node(tablename)
+                n2 = graph.get_node(referenced_table)
+                graph.add_edge(n1, n2, color="#4C4C4C", label='')
+
+    graph.layout()
+    #return graph.draw(format='png', prog='dot')
+    if not request.args:
+        return graph.draw(format='png', prog='dot')
+    else:
+        response.headers['Content-Disposition']='attachment;filename=graph.%s'%request.args(0)
+        if request.args(0) == 'dot':
+            return graph.string()
+        else:
+            return graph.draw(format=request.args(0), prog='dot')
+
+def graph_model():
+    return dict(databases=databases, pgv=pgv)
+
+def manage():
+    tables = manager_action['tables']
+    if isinstance(tables[0], str):
+        db = manager_action.get('db', auth.db)
+        db = globals()[db] if isinstance(db, str) else db
+        tables = [db[table] for table in tables]
+    if request.args(0) == 'auth':
+        auth.table_user()._plural = T('Users')
+        auth.table_group()._plural = T('Roles')
+        auth.table_membership()._plural = T('Memberships')
+        auth.table_permission()._plural = T('Permissions')
+    if request.extension != 'load':
+        return dict(heading=manager_action.get('heading',
+                    T('Manage %(action)s') % dict(action=request.args(0).replace('_', ' ').title())),
+                    tablenames=[table._tablename for table in tables],
+                    labels=[table._plural.title() for table in tables])
+
+    table = tables[request.args(1, cast=int)]
+    formname = '%s_grid' % table._tablename
+    linked_tables = orderby = None
+    if request.args(0) == 'auth':
+        auth.table_group()._id.readable = \
+        auth.table_membership()._id.readable = \
+        auth.table_permission()._id.readable = False
+        auth.table_membership().user_id.label = T('User')
+        auth.table_membership().group_id.label = T('Role')
+        auth.table_permission().group_id.label = T('Role')
+        auth.table_permission().name.label = T('Permission')
+        if table == auth.table_user():
+            linked_tables=[auth.settings.table_membership_name]
+        elif table == auth.table_group():
+            orderby = 'role' if not request.args(3) or '.group_id' not in request.args(3) else None
+        elif table == auth.table_permission():
+            orderby = 'group_id'
+    kwargs = dict(user_signature=True, maxtextlength=1000,
+                  orderby=orderby, linked_tables=linked_tables)
+    smartgrid_args = manager_action.get('smartgrid_args', {})
+    kwargs.update(**smartgrid_args.get('DEFAULT', {}))
+    kwargs.update(**smartgrid_args.get(table._tablename, {}))
+    grid = SQLFORM.smartgrid(table, args=request.args[:2], formname=formname, **kwargs)
+    return grid
--- a/applications/admin/controllers/debug.py
+++ b/applications/admin/controllers/debug.py
@@ -5,35 +5,39 @@ import gluon.contrib.shell
 import gluon.dal
 import gluon.html
 import gluon.validators
-import code, thread
+import code
+import thread
 from gluon.debug import communicate, web_debugger, qdb_debugger
 import pydoc


 if DEMO_MODE or MULTI_USER_MODE:
    session.flash = T('disabled in demo mode')
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
+
+FE = 10 ** 9

-FE=10**9

 def index():
    app = request.args(0) or 'admin'
    reset()
    # read buffer
    data = communicate()
-    return dict(app=app,data=data)
+    return dict(app=app, data=data)
+

 def callback():
    app = request.args[0]
    command = request.vars.statement
-    session['debug_commands:'+app].append(command)
+    session['debug_commands:' + app].append(command)
    output = communicate(command)
-    k = len(session['debug_commands:'+app]) - 1
+    k = len(session['debug_commands:' + app]) - 1
    return '[%i] %s%s\n' % (k + 1, command, output)

+
 def reset():
    app = request.args(0) or 'admin'
-    session['debug_commands:'+app] = []
+    session['debug_commands:' + app] = []
    return 'done'


@@ -50,9 +54,9 @@ def interact():
    filename = web_debugger.filename
    lineno = web_debugger.lineno
    if filename:
-        lines = dict([(i+1, l) for (i, l) in enumerate(
-                            [l.strip("\n").strip("\r") for l 
-                                in open(filename).readlines()])])
+        lines = dict([(i + 1, l) for (i, l) in enumerate(
+            [l.strip("\n").strip("\r") for l
+             in open(filename).readlines()])])
        filename = os.path.basename(filename)
    else:
        lines = {}
@@ -64,8 +68,8 @@ 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__ and \
+                    name not in gluon.dal.__all__:
                f_globals[name] = pydoc.text.repr(value)
    else:
        f_locals = {}
@@ -76,42 +80,48 @@ def interact():
        response.flash = T('"User Exception" debug mode. '
                           'An error ticket could be issued!')

-    return dict(app=app, data="", 
-                filename=web_debugger.filename, lines=lines, lineno=lineno, 
-                f_globals=f_globals, f_locals=f_locals, 
+    return dict(app=app, data="",
+                filename=web_debugger.filename, lines=lines, lineno=lineno,
+                f_globals=f_globals, f_locals=f_locals,
                exception=web_debugger.exception_info)

+
 def step():
    web_debugger.do_step()
    redirect(URL("interact"))

+
 def next():
    web_debugger.do_next()
    redirect(URL("interact"))

+
 def cont():
    web_debugger.do_continue()
    redirect(URL("interact"))

+
 def ret():
    web_debugger.do_return()
    redirect(URL("interact"))

+
 def stop():
    web_debugger.do_quit()
    redirect(URL("interact"))

+
 def execute():
    app = request.args[0]
    command = request.vars.statement
-    session['debug_commands:'+app].append(command)
+    session['debug_commands:' + app].append(command)
    try:
        output = web_debugger.do_exec(command)
        if output is None:
            output = ""
    except Exception, e:
-        output =  T("Exception %s") % str(e)
-    k = len(session['debug_commands:'+app]) - 1
+        output = T("Exception %s") % str(e)
+    k = len(session['debug_commands:' + app]) - 1
    return '[%i] %s%s\n' % (k + 1, command, output)


@@ -120,52 +130,54 @@ def breakpoints():

    # Get all .py files
    files = listdir(apath('', r=request), '.*\.py$')
-    files = [filename for filename in files 
-             if filename and 'languages' not in filename 
-                and not filename.startswith("admin")
-                and not filename.startswith("examples")]
+    files = [filename for filename in files
+             if filename and 'languages' not in filename
+             and not filename.startswith("admin")
+             and not filename.startswith("examples")]

    form = SQLFORM.factory(
        Field('filename', requires=IS_IN_SET(files), label=T("Filename")),
        Field('lineno', 'integer', label=T("Line number"),
              requires=IS_NOT_EMPTY()),
-        Field('temporary', 'boolean', label=T("Temporary"), 
+        Field('temporary', 'boolean', label=T("Temporary"),
              comment=T("deleted after first hit")),
        Field('condition', 'string', label=T("Condition"),
              comment=T("honored only if the expression evaluates to true")),
-        )
+    )

    if form.accepts(request.vars, session):
-        filename = os.path.join(request.env['applications_parent'], 
+        filename = os.path.join(request.env['applications_parent'],
                                'applications', form.vars.filename)
-        err = qdb_debugger.do_set_breakpoint(filename, 
-                                            form.vars.lineno,
-                                            form.vars.temporary,
-                                            form.vars.condition)
+        err = qdb_debugger.do_set_breakpoint(filename,
+                                             form.vars.lineno,
+                                             form.vars.temporary,
+                                             form.vars.condition)
        response.flash = T("Set Breakpoint on %s at line %s: %s") % (
-                            filename, form.vars.lineno, err or T('successful'))
+            filename, form.vars.lineno, err or T('successful'))

    for item in request.vars:
        if item[:7] == 'delete_':
            qdb_debugger.do_clear(item[7:])

    breakpoints = [{'number': bp[0], 'filename': os.path.basename(bp[1]),
-                    'path': bp[1], 'lineno': bp[2], 
-                    'temporary': bp[3], 'enabled': bp[4], 'hits': bp[5], 
-                    'condition': bp[6]}  
-                    for bp in qdb_debugger.do_list_breakpoint()]
+                    'path': bp[1], 'lineno': bp[2],
+                    'temporary': bp[3], 'enabled': bp[4], 'hits': bp[5],
+                    'condition': bp[6]}
+                   for bp in qdb_debugger.do_list_breakpoint()]

    return dict(breakpoints=breakpoints, form=form)


 def toggle_breakpoint():
    "Set or clear a breakpoint"
-    
+
    lineno = None
    ok = None
    try:
-        filename = os.path.join(request.env['applications_parent'], 
+        filename = os.path.join(request.env['applications_parent'],
                                'applications', request.vars.filename)
+        # normalize path name: replace slashes, references, etc...
+        filename = os.path.normpath(os.path.normcase(filename))
        if not request.vars.data:
            # ace send us the line number!
            lineno = int(request.vars.sel_start) + 1
@@ -182,16 +194,18 @@ def toggle_breakpoint():
        if lineno is not None:
            for bp in qdb_debugger.do_list_breakpoint():
                no, bp_filename, bp_lineno, temporary, enabled, hits, cond = bp
+                # normalize path name: replace slashes, references, etc...
+                bp_filename = os.path.normpath(os.path.normcase(bp_filename))
                if filename == bp_filename and lineno == bp_lineno:
                    err = qdb_debugger.do_clear_breakpoint(filename, lineno)
-                    response.flash = T("Removed Breakpoint on %s at line %s", ( 
-                                        filename, lineno))
+                    response.flash = T("Removed Breakpoint on %s at line %s", (
+                        filename, lineno))
                    ok = False
                    break
            else:
                err = qdb_debugger.do_set_breakpoint(filename, lineno)
                response.flash = T("Set Breakpoint on %s at line %s: %s") % (
-                                    filename, lineno, err or T('successful'))
+                    filename, lineno, err or T('successful'))
                ok = True
        else:
            response.flash = T("Unable to determine the line number!")
@@ -199,3 +213,24 @@ def toggle_breakpoint():
        session.flash = str(e)
    return response.json({'ok': ok, 'lineno': lineno})

+def list_breakpoints():
+    "Return a list of linenumbers for current breakpoints"
+
+    breakpoints = []
+    ok = None
+    try:
+        filename = os.path.join(request.env['applications_parent'],
+                                'applications', request.vars.filename)
+        # normalize path name: replace slashes, references, etc...
+        filename = os.path.normpath(os.path.normcase(filename))
+        for bp in qdb_debugger.do_list_breakpoint():
+            no, bp_filename, bp_lineno, temporary, enabled, hits, cond = bp
+            # normalize path name: replace slashes, references, etc...
+            bp_filename = os.path.normpath(os.path.normcase(bp_filename))
+            if filename == bp_filename:
+                breakpoints.append(bp_lineno)
+        ok = True
+    except Exception, e:
+        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
--- a/applications/admin/controllers/gae.py
+++ b/applications/admin/controllers/gae.py
@@ -9,85 +9,97 @@ try:
    import shutil
    from gluon.fileutils import read_file, write_file
 except:
-    session.flash='sorry, only on Unix systems'
-    redirect(URL(request.application,'default','site'))
+    session.flash = 'sorry, only on Unix systems'
+    redirect(URL(request.application, 'default', 'site'))

 if MULTI_USER_MODE and not is_manager():
    session.flash = 'Not Authorized'
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
+
+from gluon.settings import settings
+if not settings.is_source:
+    session.flash = 'Requires running web2py from source'
+    redirect(URL(request.application, 'default', 'site'))
+
+forever = 10 ** 8

-forever=10**8

 def kill():
-    p = cache.ram('gae_upload',lambda:None,forever)
-    if not p or p.poll()!=None:
+    p = cache.ram('gae_upload', lambda: None, forever)
+    if not p or p.poll() is not None:
        return 'oops'
    os.kill(p.pid, signal.SIGKILL)
-    cache.ram('gae_upload',lambda:None,-1)
+    cache.ram('gae_upload', lambda: None, -1)
+

 class EXISTS(object):
    def __init__(self, error_message='file not found'):
        self.error_message = error_message
+
    def __call__(self, value):
        if os.path.exists(value):
-            return (value,None)
-        return (value,self.error_message)
+            return (value, None)
+        return (value, self.error_message)
+

 def deploy():
    regex = re.compile('^\w+$')
-    apps = sorted(file for file in os.listdir(apath(r=request)) if regex.match(file))
+    apps = sorted(
+        file for file in os.listdir(apath(r=request)) if regex.match(file))
    form = SQLFORM.factory(
-        Field('appcfg',default=GAE_APPCFG,label=T('Path to appcfg.py'),
+        Field('appcfg', default=GAE_APPCFG, label=T('Path to appcfg.py'),
              requires=EXISTS(error_message=T('file not found'))),
-        Field('google_application_id',requires=IS_ALPHANUMERIC(),label=T('Google Application Id')),
-        Field('applications','list:string',
-              requires=IS_IN_SET(apps,multiple=True),
+        Field('google_application_id', requires=IS_MATCH(
+            '[\w\-]+'), label=T('Google Application Id')),
+        Field('applications', 'list:string',
+              requires=IS_IN_SET(apps, multiple=True),
              label=T('web2py apps to deploy')),
-        Field('email',requires=IS_EMAIL(),label=T('GAE Email')),
-        Field('password','password',requires=IS_NOT_EMPTY(),label=T('GAE Password')))
-    cmd = output = errors= ""
-    if form.accepts(request,session):
+        Field('email', requires=IS_EMAIL(), label=T('GAE Email')),
+        Field('password', 'password', requires=IS_NOT_EMPTY(), label=T('GAE Password')))
+    cmd = output = errors = ""
+    if form.accepts(request, session):
        try:
            kill()
        except:
            pass
-        ignore_apps = [item for item in apps \
-                           if not item in form.vars.applications]
+        ignore_apps = [item for item in apps
+                       if not item in form.vars.applications]
        regex = re.compile('\(applications/\(.*')
        yaml = apath('../app.yaml', r=request)
        if not os.path.exists(yaml):
            example = apath('../app.example.yaml', r=request)
-            shutil.copyfile(example,yaml)
+            shutil.copyfile(example, yaml)
        data = read_file(yaml)
-        data = re.sub('application:.*','application: %s' % form.vars.google_application_id,data)
-        data = regex.sub('(applications/(%s)/.*)|' % '|'.join(ignore_apps),data)
+        data = re.sub('application:.*', 'application: %s' %
+                      form.vars.google_application_id, data)
+        data = regex.sub(
+            '(applications/(%s)/.*)|' % '|'.join(ignore_apps), data)
        write_file(yaml, data)

        path = request.env.applications_parent
        cmd = '%s --email=%s --passin update %s' % \
            (form.vars.appcfg, form.vars.email, path)
        p = cache.ram('gae_upload',
-                      lambda s=subprocess,c=cmd:s.Popen(c, shell=True,
-                                                        stdin=s.PIPE,
-                                                        stdout=s.PIPE,
-                                                        stderr=s.PIPE, close_fds=True),-1)
-        p.stdin.write(form.vars.password+'\n')
+                      lambda s=subprocess, c=cmd: s.Popen(c, shell=True,
+                                                          stdin=s.PIPE,
+                                                          stdout=s.PIPE,
+                                                          stderr=s.PIPE, close_fds=True), -1)
+        p.stdin.write(form.vars.password + '\n')
        fcntl.fcntl(p.stdout.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
        fcntl.fcntl(p.stderr.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
-    return dict(form=form,command=cmd)
+    return dict(form=form, command=cmd)
+

 def callback():
-    p = cache.ram('gae_upload',lambda:None,forever)
-    if not p or p.poll()!=None:
+    p = cache.ram('gae_upload', lambda: None, forever)
+    if not p or p.poll() is not None:
        return '<done/>'
    try:
        output = p.stdout.read()
    except:
-        output=''
+        output = ''
    try:
        errors = p.stderr.read()
    except:
-        errors=''
-    return (output+errors).replace('\n','<br/>')
-
-
+        errors = ''
+    return (output + errors).replace('\n', '<br/>')
--- a/applications/admin/controllers/mercurial.py
+++ b/applications/admin/controllers/mercurial.py
@@ -2,10 +2,10 @@ from gluon.fileutils import read_file, write_file

 if DEMO_MODE or MULTI_USER_MODE:
    session.flash = T('disabled in demo mode')
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
 if not have_mercurial:
-    session.flash=T("Sorry, could not find mercurial installed")
-    redirect(URL('default','design',args=request.args(0)))
+    session.flash = T("Sorry, could not find mercurial installed")
+    redirect(URL('default', 'design', args=request.args(0)))

 _hgignore_content = """\
 syntax: glob
@@ -22,6 +22,7 @@ sessions/*
 errors/*
 """

+
 def hg_repo(path):
    import os
    uio = ui.ui()
@@ -37,48 +38,48 @@ def hg_repo(path):
        write_file(hgignore, _hgignore_content)
    return repo

+
 def commit():
    app = request.args(0)
    path = apath(app, r=request)
    repo = hg_repo(path)
-    form = FORM('Comment:',INPUT(_name='comment',requires=IS_NOT_EMPTY()),
-                INPUT(_type='submit',_value=T('Commit')))
-    if form.accepts(request.vars,session):
+    form = FORM(T('Comment:'), INPUT(_name='comment', requires=IS_NOT_EMPTY()),
+                INPUT(_type='submit', _value=T('Commit')))
+    if form.accepts(request.vars, session):
        oldid = repo[repo.lookup('.')]
        addremove(repo)
        repo.commit(text=form.vars.comment)
        if repo[repo.lookup('.')] == oldid:
-            response.flash = 'no changes'
+            response.flash = T('no changes')
    try:
        files = TABLE(*[TR(file) for file in repo[repo.lookup('.')].files()])
-        changes = TABLE(TR(TH('revision'),TH('description')))
+        changes = TABLE(TR(TH('revision'), TH('description')))
        for change in repo.changelog:
-            ctx=repo.changectx(change)
+            ctx = repo.changectx(change)
            revision, description = ctx.rev(), ctx.description()
-            changes.append(TR(A(revision,_href=URL('revision',
-                                                   args=(app,revision))),
+            changes.append(TR(A(revision, _href=URL('revision',
+                                                    args=(app, revision))),
                              description))
    except:
        files = []
        changes = []
-    return dict(form=form,files=files,changes=changes,repo=repo)
+    return dict(form=form, files=files, changes=changes, repo=repo)
+

 def revision():
    app = request.args(0)
    path = apath(app, r=request)
    repo = hg_repo(path)
    revision = request.args(1)
-    ctx=repo.changectx(revision)
-    form=FORM(INPUT(_type='submit',_value=T('Revert')))
+    ctx = repo.changectx(revision)
+    form = FORM(INPUT(_type='submit', _value=T('Revert')))
    if form.accepts(request.vars):
        hg.update(repo, revision)
-        session.flash = "reverted to revision %s" % ctx.rev()
-        redirect(URL('default','design',args=app))
+        session.flash = T("reverted to revision %s") % ctx.rev()
+        redirect(URL('default', 'design', args=app))
    return dict(
        files=ctx.files(),
        rev=str(ctx.rev()),
        desc=ctx.description(),
        form=form
-        )
-
-
+    )
--- a/applications/admin/controllers/openshift.py
+++ b/applications/admin/controllers/openshift.py
@@ -1,29 +1,40 @@
 import os
-from distutils import dir_util
+try:
+    from distutils import dir_util
+except ImportError:
+    session.flash = T('requires distutils, but not installed')
+    redirect(URL('default', 'site'))
 try:
    from git import *
 except ImportError:
    session.flash = T('requires python-git, but not installed')
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
+
+from gluon.settings import settings
+if not settings.is_source:
+    session.flash = 'Requires running web2py from source'
+    redirect(URL(request.application, 'default', 'site'))

 def deploy():
    apps = sorted(file for file in os.listdir(apath(r=request)))
    form = SQLFORM.factory(
-        Field('osrepo',default='/tmp',label=T('Path to local openshift repo root.'),
-              requires=EXISTS(error_message=T('directory not found'))),
-        Field('osname',default='web2py',label=T('WSGI reference name')),
-        Field('applications','list:string',
-              requires=IS_IN_SET(apps,multiple=True),
+        Field(
+            'osrepo', default='/tmp', label=T('Path to local openshift repo root.'),
+            requires=EXISTS(error_message=T('directory not found'))),
+        Field('osname', default='web2py', label=T('WSGI reference name')),
+        Field('applications', 'list:string',
+              requires=IS_IN_SET(apps, multiple=True),
              label=T('web2py apps to deploy')))

-    cmd = output = errors= ""
-    if form.accepts(request,session):
+    cmd = output = errors = ""
+    if form.accepts(request, session):
        try:
            kill()
        except:
            pass
-        
-        ignore_apps = [item for item in apps if not item in form.vars.applications]
+
+        ignore_apps = [
+            item for item in apps if not item in form.vars.applications]
        regex = re.compile('\(applications/\(.*')
        w2p_origin = os.getcwd()
        osrepo = form.vars.osrepo
@@ -34,23 +45,25 @@ def deploy():
        assert repo.bare == False

        for i in form.vars.applications:
-            appsrc = os.path.join(apath(r=request),i)
-            appdest = os.path.join(osrepo,'wsgi',osname,'applications',i)
-            dir_util.copy_tree(appsrc,appdest)
+            appsrc = os.path.join(apath(r=request), i)
+            appdest = os.path.join(osrepo, 'wsgi', osname, 'applications', i)
+            dir_util.copy_tree(appsrc, appdest)
            #shutil.copytree(appsrc,appdest)
-            index.add(['wsgi/'+osname+'/applications/'+i])
+            index.add(['wsgi/' + osname + '/applications/' + i])
            new_commit = index.commit("Deploy from Web2py IDE")
-        
+
        origin = repo.remotes.origin
        origin.push
        origin.push()
        #Git code ends here
-    return dict(form=form,command=cmd)
-        
+    return dict(form=form, command=cmd)
+
+
 class EXISTS(object):
    def __init__(self, error_message='file not found'):
        self.error_message = error_message
+
    def __call__(self, value):
        if os.path.exists(value):
-            return (value,None)
-        return (value,self.error_message)
+            return (value, None)
+        return (value, self.error_message)
--- a/applications/admin/controllers/plugin_jqmobile.py
+++ b/applications/admin/controllers/plugin_jqmobile.py
@@ -1,10 +1,10 @@
-response.files=response.files[:3]
-response.menu=[]
+response.files = response.files[:3]
+response.menu = []
+

 def index():
    return locals()

+
 def about():
    return locals()
-
-
--- a/applications/admin/controllers/shell.py
+++ b/applications/admin/controllers/shell.py
@@ -1,25 +1,29 @@
 import sys
 import cStringIO
 import gluon.contrib.shell
-import code, thread
+import code
+import thread
 from gluon.shell import env

 if DEMO_MODE or MULTI_USER_MODE:
    session.flash = T('disabled in demo mode')
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
+
+FE = 10 ** 9

-FE=10**9

 def index():
    app = request.args(0) or 'admin'
    reset()
    return dict(app=app)

+
 def callback():
    app = request.args[0]
    command = request.vars.statement
-    escape = command[:1]!='!'
-    history = session['history:'+app] = session.get('history:'+app,gluon.contrib.shell.History())
+    escape = command[:1] != '!'
+    history = session['history:' + app] = session.get(
+        'history:' + app, gluon.contrib.shell.History())
    if not escape:
        command = command[1:]
    if command == '%reset':
@@ -27,21 +31,20 @@ def callback():
        return '*** reset ***'
    elif command[0] == '%':
        try:
-            command=session['commands:'+app][int(command[1:])]
+            command = session['commands:' + app][int(command[1:])]
        except ValueError:
            return ''
-    session['commands:'+app].append(command)
-    environ=env(app,True)
-    output = gluon.contrib.shell.run(history,command,environ)
-    k = len(session['commands:'+app]) - 1
+    session['commands:' + app].append(command)
+    environ = env(app, True, extra_request=dict(is_https=request.is_https))
+    output = gluon.contrib.shell.run(history, command, environ)
+    k = len(session['commands:' + app]) - 1
    #output = PRE(output)
    #return TABLE(TR('In[%i]:'%k,PRE(command)),TR('Out[%i]:'%k,output))
    return 'In [%i] : %s%s\n' % (k + 1, command, output)

+
 def reset():
    app = request.args(0) or 'admin'
-    session['commands:'+app] = []
-    session['history:'+app] = gluon.contrib.shell.History()
+    session['commands:' + app] = []
+    session['history:' + app] = gluon.contrib.shell.History()
    return 'done'
-
-
--- a/applications/admin/controllers/toolbar.py
+++ b/applications/admin/controllers/toolbar.py
@@ -2,10 +2,12 @@ import os
 from gluon.settings import global_settings, read_file
 #

+
 def index():
    app = request.args(0)
    return dict(app=app)

+
 def profiler():
    """
    to use the profiler start web2py with -F profiler.log
@@ -19,13 +21,11 @@ def profiler():
        else:
            size = 0
        if os.path.exists(filename):
-            data = read_file('profiler.log','rb')
-            if size<len(data):
+            data = read_file('profiler.log', 'rb')
+            if size < len(data):
                data = data[size:]
            else:
-                size=0
+                size = 0
            size += len(data)
            response.cookies[KEY] = size
    return data
-
-
--- a/applications/admin/controllers/webservices.py
+++ b/applications/admin/controllers/webservices.py
@@ -33,7 +33,7 @@ def list_apps():
@service.jsonrpc
 def list_files(app, pattern='.*\.py$'):
    files = listdir(apath('%s/' % app, r=request), pattern)
-    return [x.replace('\\','/') for x in files]
+    return [x.replace('\\', '/') for x in files]


@service.jsonrpc
@@ -43,7 +43,7 @@ def read_file(filename, b64=False):
    try:
        data = f.read()
        if not b64:
-            data = data.replace('\r','')
+            data = data.replace('\r', '')
        else:
            data = base64.b64encode(data)
    finally:
@@ -82,6 +82,7 @@ def install(app_name, filename, data, overwrite=True):

    return installed

+
@service.jsonrpc
 def attach_debugger(host='localhost', port=6000, authkey='secret password'):
    import gluon.contrib.qdb as qdb
@@ -90,7 +91,7 @@ def attach_debugger(host='localhost', port=6000, authkey='secret password'):

    if isinstance(authkey, unicode):
        authkey = authkey.encode('utf8')
-   
+
    if not hasattr(gluon.debug, 'qdb_listener'):
        # create a remote debugger server and wait for connection
        address = (host, port)     # family is deduced to be 'AF_INET'
@@ -124,7 +125,7 @@ def detach_debugger():
    gluon.debug.qdb_debugger = None
    return True

+
 def call():
    session.forget()
    return service()
-
--- a/applications/admin/controllers/wizard.py
+++ b/applications/admin/controllers/wizard.py
@@ -1,64 +1,73 @@
 # -*- coding: utf-8 -*-

-import os, uuid, re, pickle, urllib, glob
+import os
+import uuid
+import re
+import pickle
+import urllib
+import glob
 from gluon.admin import app_create, plugin_install
 from gluon.fileutils import abspath, read_file, write_file

-def reset(session):
-    session.app={
-        'name':'',
-        'params':[('title','My New App'),
-                  ('subtitle','powered by web2py'),
-                  ('author','you'),
-                  ('author_email','you@example.com'),
-                  ('keywords',''),
-                  ('description',''),
-                  ('layout_theme','Default'),
-                  ('database_uri','sqlite://storage.sqlite'),
-                  ('security_key',str(uuid.uuid4())),
-                  ('email_server','localhost'),
-                  ('email_sender','you@example.com'),
-                  ('email_login',''),
-                  ('login_method','local'),
-                  ('login_config',''),
-                  ('plugins',[])],
-        'tables':['auth_user'],
-        'table_auth_user':['username','first_name',
-                           'last_name','email','password'],
-        'pages':['index','error'],
-        'page_index':'# Welcome to my new app',
-        'page_error':'# Error: the document does not exist',
-        }

-if not session.app: reset(session)
+def reset(session):
+    session.app = {
+        'name': '',
+        'params': [('title', 'My New App'),
+                   ('subtitle', 'powered by web2py'),
+                   ('author', 'you'),
+                   ('author_email', 'you@example.com'),
+                   ('keywords', ''),
+                   ('description', ''),
+                   ('layout_theme', 'Default'),
+                   ('database_uri', 'sqlite://storage.sqlite'),
+                   ('security_key', str(uuid.uuid4())),
+                   ('email_server', 'localhost'),
+                   ('email_sender', 'you@example.com'),
+                   ('email_login', ''),
+                   ('login_method', 'local'),
+                   ('login_config', ''),
+                   ('plugins', [])],
+        'tables': ['auth_user'],
+        'table_auth_user': ['username', 'first_name',
+                            'last_name', 'email', 'password'],
+        'pages': ['index', 'error'],
+        'page_index': '# Welcome to my new app',
+        'page_error': '# Error: the document does not exist',
+    }
+
+if not session.app:
+    reset(session)
+

 def listify(x):
-    if not isinstance(x,(list,tuple)):
+    if not isinstance(x, (list, tuple)):
        return x and [x] or []
    return x

+
 def clean(name):
-    return re.sub('\W+','_',name.strip().lower())
+    return re.sub('\W+', '_', name.strip().lower())
+

 def index():
-    response.view='wizard/step.html'
+    response.view = 'wizard/step.html'
    reset(session)
-    apps=os.listdir(os.path.join(request.folder,'..'))
-    form=SQLFORM.factory(Field('name',requires=[IS_NOT_EMPTY(),
-                                                IS_ALPHANUMERIC()]))
+    apps = os.listdir(os.path.join(request.folder, '..'))
+    form = SQLFORM.factory(Field('name', requires=[IS_NOT_EMPTY(),
+                                                   IS_ALPHANUMERIC()]), _class='span5 well well-small')
    if form.accepts(request.vars):
        app = form.vars.name
        session.app['name'] = app
-        if MULTI_USER_MODE and db(db.app.name==app)\
-                (db.app.owner!=auth.user.id).count():
+        if MULTI_USER_MODE and db(db.app.name == app)(db.app.owner != auth.user.id).count():
            session.flash = 'App belongs already to other user'
        elif app in apps:
-            meta = os.path.normpath(\
+            meta = os.path.normpath(
                os.path.join(os.path.normpath(request.folder),
-                             '..',app,'wizard.metadata'))
+                             '..', app, 'wizard.metadata'))
            if os.path.exists(meta):
                try:
-                    metafile = open(meta,'rb')
+                    metafile = open(meta, 'rb')
                    try:
                        session.app = pickle.load(metafile)
                    finally:
@@ -67,160 +76,175 @@ def index():
                except:
                    session.flash = T("The app exists, was NOT created by wizard, continue to overwrite!")
        redirect(URL('step1'))
-    return dict(step='Start',form=form)
+    return dict(step='Start', form=form)


 def step1():
    from gluon.contrib.simplejson import loads
    import urllib
    if not session.themes:
-        url=LAYOUTS_APP+'/default/layouts.json'
-        try:
-            data = urllib.urlopen(url).read()
-            session.themes = ['Default'] + loads(data)['layouts']
-        except:
-            session.themes = ['Default']
+        #url = LAYOUTS_APP + '/default/layouts.json'
+        #try:
+        #    data = urllib.urlopen(url).read()
+        #    session.themes = ['Default'] + loads(data)['layouts']
+        #except:
+        session.themes = ['Default']
    themes = session.themes
    if not session.plugins:
-        url = PLUGINS_APP+'/default/plugins.json'
-        try:
-            data = urllib.urlopen(url).read()
-            session.plugins = loads(data)['plugins']
-        except:
-            session.plugins = []
+        #url = PLUGINS_APP + '/default/plugins.json'
+        #try:
+        #    data = urllib.urlopen(url).read()
+        #    session.plugins = loads(data)['plugins']
+        #except:
+        session.plugins = []
    plugins = [x.split('.')[2] for x in session.plugins]
-    response.view='wizard/step.html'
+    response.view = 'wizard/step.html'
    params = dict(session.app['params'])
-    form=SQLFORM.factory(
-                Field('title',default=params.get('title',None),
-                                      requires=IS_NOT_EMPTY()),
-                Field('subtitle',default=params.get('subtitle',None)),
-                Field('author',default=params.get('author',None)),
-                Field('author_email',default=params.get('author_email',None)),
-                Field('keywords',default=params.get('keywords',None)),
-                Field('description','text',
-                      default=params.get('description',None)),
-                Field('layout_theme',requires=IS_IN_SET(themes),
-                      default=params.get('layout_theme',themes[0])),
-                Field('database_uri',default=params.get('database_uri',None)),
-                Field('security_key',default=params.get('security_key',None)),
-                Field('email_server',default=params.get('email_server',None)),
-                Field('email_sender',default=params.get('email_sender',None)),
-                Field('email_login',default=params.get('email_login',None)),
-                Field('login_method',requires=IS_IN_SET(('local','janrain')),
-                      default=params.get('login_method','local')),
-                Field('login_config',default=params.get('login_config',None)),
-                Field('plugins','list:string',requires=IS_IN_SET(plugins,multiple=True)))
+    form = SQLFORM.factory(
+        Field('title', default=params.get('title', None),
+              requires=IS_NOT_EMPTY()),
+        Field('subtitle', default=params.get('subtitle', None)),
+        Field('author', default=params.get('author', None)),
+        Field(
+            'author_email', default=params.get('author_email', None)),
+        Field('keywords', default=params.get('keywords', None)),
+        Field('description', 'text',
+              default=params.get('description', None)),
+        Field('layout_theme', requires=IS_IN_SET(themes),
+              default=params.get('layout_theme', themes[0])),
+        Field(
+            'database_uri', default=params.get('database_uri', None)),
+        Field(
+            'security_key', default=params.get('security_key', None)),
+        Field(
+            'email_server', default=params.get('email_server', None)),
+        Field(
+            'email_sender', default=params.get('email_sender', None)),
+        Field('email_login', default=params.get('email_login', None)),
+        Field('login_method', requires=IS_IN_SET(('local', 'janrain')),
+              default=params.get('login_method', 'local')),
+        Field(
+            'login_config', default=params.get('login_config', None)),
+        Field('plugins', 'list:string', requires=IS_IN_SET(plugins, multiple=True)),
+        _class='span7 well well-small')

    if form.accepts(request.vars):
-        session.app['params']=[(key,form.vars.get(key,None))
-                               for key,value in session.app['params']]
-        redirect(URL('step2'))
-    return dict(step='1: Setting Parameters',form=form)
+        session.app['params'] = [(key, form.vars.get(key, None))
+                                 for key, value in session.app['params']]
+        redirect(URL('step2')  + '/#xwizard_form')
+    return dict(step='1: Setting Parameters', form=form)
+

 def step2():
-    response.view='wizard/step.html'
-    form=SQLFORM.factory(Field('table_names','list:string',
-                               default=session.app['tables']))
+    response.view = 'wizard/step.html'
+    form = SQLFORM.factory(Field('table_names', 'list:string',
+                                 default=session.app['tables']), _class="span7 well well-small")
    if form.accepts(request.vars):
-        table_names = [clean(t) for t in listify(form.vars.table_names) \
-                           if t.strip()]
-        if [t for t in table_names if t.startswith('auth_') and \
-                not t=='auth_user']:
+        table_names = [clean(t) for t in listify(form.vars.table_names)
+                       if t.strip()]
+        if [t for t in table_names if t.startswith('auth_') and
+                not t == 'auth_user']:
            form.error.table_names = \
                T('invalid table names (auth_* tables already defined)')
        else:
-            session.app['tables']=table_names
+            session.app['tables'] = table_names
            for table in session.app['tables']:
-                if not 'table_'+table in session.app:
-                    session.app['table_'+table]=['name']
-                if not table=='auth_user':
-                    name = table+'_manage'
+                if not 'table_' + table in session.app:
+                    session.app['table_' + table] = ['name']
+                if not table == 'auth_user':
+                    name = table + '_manage'
                    if not name in session.app['pages']:
                        session.app['pages'].append(name)
-                        session.app['page_'+name] = \
+                        session.app['page_' + name] = \
                            '## Manage %s\n\n{{=form}}' % (table)
            if session.app['tables']:
-                redirect(URL('step3',args=0))
+                redirect(URL('step3', args=0) + '/#xwizard_form')
            else:
-                redirect(URL('step4'))
-    return dict(step='2: Tables',form=form)
+                redirect(URL('step4') + '/#xwizard_form')
+    return dict(step='2: Tables', form=form)
+

 def step3():
-    response.view='wizard/step.html'
-    n=int(request.args(0) or 0)
-    m=len(session.app['tables'])
-    if n>=m: redirect(URL('step2'))
-    table=session.app['tables'][n]
-    form=SQLFORM.factory(Field('field_names','list:string',
-                               default=session.app.get('table_'+table,[])))
+    response.view = 'wizard/step.html'
+    n = int(request.args(-1) or 0)
+    m = len(session.app['tables'])
+    if n >= m:
+        redirect(URL('step2'))
+    table = session.app['tables'][n]
+    form = SQLFORM.factory(Field('field_names', 'list:string',
+                                 default=session.app.get('table_' + table, [])), _class="span7 well well-small")
    if form.accepts(request.vars) and form.vars.field_names:
-        fields=listify(form.vars.field_names)
-        if table=='auth_user':
-            for field in ['first_name','last_name','username','email','password']:
+        fields = listify(form.vars.field_names)
+        if table == 'auth_user':
+            for field in ['first_name', 'last_name', 'username', 'email', 'password']:
                if not field in fields:
                    fields.append(field)
-        session.app['table_'+table]=[t.strip().lower()
-                                       for t in listify(form.vars.field_names)
-                                       if t.strip()]
+        session.app['table_' + table] = [t.strip().lower()
+                                         for t in listify(form.vars.field_names)
+                                         if t.strip()]
        try:
-            tables=sort_tables(session.app['tables'])
+            tables = sort_tables(session.app['tables'])
        except RuntimeError:
-            response.flash=T('invalid circular reference')
+            response.flash = T('invalid circular reference')
        else:
-            if n<m-1:
-                redirect(URL('step3',args=n+1))
+            if n < m - 1:
+                redirect(URL('step3', args=n + 1) + '/#xwizard_form')
            else:
-                redirect(URL('step4'))
-    return dict(step='3: Fields for table "%s" (%s of %s)' \
-                    % (table,n+1,m),table=table,form=form)
+                redirect(URL('step4') + '/#xwizard_form')
+    return dict(step='3: Fields for table "%s" (%s of %s)'
+                % (table, n + 1, m), table=table, form=form)
+

 def step4():
-    response.view='wizard/step.html'
-    form=SQLFORM.factory(Field('pages','list:string',
-                               default=session.app['pages']))
+    response.view = 'wizard/step.html'
+    form = SQLFORM.factory(Field('pages', 'list:string',
+                                 default=session.app['pages']), _class="span7 well well-small")
    if form.accepts(request.vars):
-        session.app['pages']=[clean(t)
-                              for t in listify(form.vars.pages)
-                              if t.strip()]
+        session.app['pages'] = [clean(t)
+                                for t in listify(form.vars.pages)
+                                if t.strip()]
        if session.app['pages']:
-            redirect(URL('step5',args=0))
+            redirect(URL('step5', args=0) + '/#xwizard_form')
        else:
-            redirect(URL('step6'))
-    return dict(step='4: Pages',form=form)
+            redirect(URL('step6') + '/#xwizard_form')
+    return dict(step='4: Pages', form=form)
+

 def step5():
-    response.view='wizard/step.html'
-    n=int(request.args(0) or 0)
-    m=len(session.app['pages'])
-    if n>=m: redirect(URL('step4'))
-    page=session.app['pages'][n]
-    markmin_url='http://web2py.com/examples/static/markmin.html'
-    form=SQLFORM.factory(Field('content','text',
-                               default=session.app.get('page_'+page,[]),
-                               comment=A('use markmin',
-                                         _href=markmin_url,_target='_blank')),
-                         formstyle='table2cols')
+    response.view = 'wizard/step.html'
+    n = int(request.args(-1) or 0)
+    m = len(session.app['pages'])
+    if n >= m:
+        redirect(URL('step4'))
+    page = session.app['pages'][n]
+    markmin_url = 'http://web2py.com/examples/static/markmin.html'
+    form = SQLFORM.factory(Field('content', 'text',
+                                 default=session.app.get('page_' + page, []),
+                                 comment=A('use markmin',
+                                           _href=markmin_url, _target='_blank')),
+                           formstyle='table2cols', _class="span7 well well-small")
    if form.accepts(request.vars):
-        session.app['page_'+page]=form.vars.content
-        if n<m-1:
-            redirect(URL('step5',args=n+1))
+        session.app['page_' + page] = form.vars.content
+        if n < m - 1:
+            redirect(URL('step5', args=n + 1) + '/#xwizard_form')
        else:
-            redirect(URL('step6'))
-    return dict(step='5: View for page "%s" (%s of %s)' % (page,n+1,m),form=form)
+            redirect(URL('step6') + '/#xwizard_form')
+    return dict(step='5: View for page "%s" (%s of %s)' % (page, n + 1, m), form=form)
+

 def step6():
-    response.view='wizard/step.html'
+    response.view = 'wizard/step.html'
    params = dict(session.app['params'])
    app = session.app['name']
-    form=SQLFORM.factory(
-        Field('generate_model','boolean',default=True),
-        Field('generate_controller','boolean',default=True),
-        Field('generate_views','boolean',default=True),
-        Field('generate_menu','boolean',default=True),
-        Field('apply_layout','boolean',default=True),
-        Field('erase_database','boolean',default=True),
-        Field('populate_database','boolean',default=True))
+    form = SQLFORM.factory(
+        Field('generate_model', 'boolean', default=True),
+        Field('generate_controller', 'boolean', default=True),
+        Field('generate_views', 'boolean', default=True),
+        Field('generate_menu', 'boolean', default=True),
+        Field('apply_layout', 'boolean', default=True),
+        Field('erase_database', 'boolean', default=True),
+        Field('populate_database', 'boolean', default=True),
+        _id="generate_form", _class="form-horizontal span7 well well-small")
    if form.accepts(request.vars):
        if DEMO_MODE:
            session.flash = T('Application cannot be generated in demo mode')
@@ -228,159 +252,173 @@ def step6():
        create(form.vars)
        session.flash = 'Application %s created' % app
        redirect(URL('generated'))
-    return dict(step='6: Generate app "%s"' % app,form=form)
+    return dict(step='6: Generate app "%s"' % app, form=form)
+

 def generated():
    return dict(app=session.app['name'])

+
 def sort_tables(tables):
    import re
    regex = re.compile('(%s)' % '|'.join(tables))
    is_auth_user = 'auth_user' in tables
-    d={}
+    d = {}
    for table in tables:
-        d[table]=[]
+        d[table] = []
        for field in session.app['table_%s' % table]:
-            d[table]+=regex.findall(field)
-    tables=[]
+            d[table] += regex.findall(field)
+    tables = []
    if is_auth_user:
        tables.append('auth_user')
-    def append(table,trail=[]):
+
+    def append(table, trail=[]):
        if table in trail:
            raise RuntimeError
        for t in d[table]:
            # if not t==table: (problem, no dropdown for self references)
-            append(t,trail=trail+[table])
+            append(t, trail=trail + [table])
        if not table in tables:
            tables.append(table)
-    for table in d: append(table)
+    for table in d:
+        append(table)
    return tables

-def make_table(table,fields):
-    rawtable=table
-    if table!='auth_user': table='t_'+table
-    s=''
-    s+='\n'+'#'*40+'\n'
-    s+="db.define_table('%s',\n" % table
-    first_field='id'
+
+def make_table(table, fields):
+    rawtable = table
+    if table != 'auth_user':
+        table = 't_' + table
+    s = ''
+    s += '\n' + '#' * 40 + '\n'
+    s += "db.define_table('%s',\n" % table
+    first_field = 'id'
    for field in fields:
-        items=[x.lower() for x in field.split()]
+        items = [x.lower() for x in field.split()]
        has = {}
        keys = []
-        for key in ['notnull','unique','integer','double','boolean','float',
-                    'boolean', 'date','time','datetime','text','wiki',
-                    'html','file','upload','image','true',
-                    'hidden','readonly','writeonly','multiple',
-                    'notempty','required']:
+        for key in ['notnull', 'unique', 'integer', 'double', 'boolean', 'float',
+                    'boolean', 'date', 'time', 'datetime', 'text', 'wiki',
+                    'html', 'file', 'upload', 'image', 'true',
+                    'hidden', 'readonly', 'writeonly', 'multiple',
+                    'notempty', 'required']:
            if key in items[1:]:
                keys.append(key)
                has[key] = True
        tables = session.app['tables']
        refs = [t for t in tables if t in items]
-        items = items[:1] + [x for x in items[1:] \
-                                 if not x in keys and not x in tables]
+        items = items[:1] + [x for x in items[1:]
+                             if not x in keys and not x in tables]
        barename = name = '_'.join(items)
-        if table[:2]=='t_': name='f_'+name
-        if first_field=='id': first_field=name
+        if table[:2] == 't_': name = 'f_' + name
+        if first_field == 'id':
+            first_field = name

        ### determine field type
-        ftype='string'
-        deftypes={'integer':'integer','double':'double','boolean':'boolean',
-                  'float':'double','bool':'boolean',
-                  'date':'date','time':'time','datetime':'datetime',
-                  'text':'text','file':'upload','image':'upload',
-                  'upload':'upload','wiki':'text', 'html':'text'}
-        for key,t in deftypes.items():
+        ftype = 'string'
+        deftypes = {'integer': 'integer', 'double': 'double', 'boolean': 'boolean',
+                    'float': 'double', 'bool': 'boolean',
+                    'date': 'date', 'time': 'time', 'datetime': 'datetime',
+                    'text': 'text', 'file': 'upload', 'image': 'upload',
+                    'upload': 'upload', 'wiki': 'text', 'html': 'text'}
+        for key, t in deftypes.items():
            if key in has:
                ftype = t
        if refs:
            key = refs[0]
-            if not key=='auth_user': key='t_'+key
+            if not key == 'auth_user':
+                key = 't_' + key
            if 'multiple' in has:
-                ftype='list:reference %s' % key
+                ftype = 'list:reference %s' % key
            else:
-                ftype='reference %s' % key
-        if ftype=='string' and 'multiple' in has:
-            ftype='list:string'
-        elif ftype=='integer' and 'multiple' in has:
-            ftype='list:integer'
-        elif name=='password':
-            ftype='password'
-        s+="    Field('%s', type='%s'" % (name, ftype)
+                ftype = 'reference %s' % key
+        if ftype == 'string' and 'multiple' in has:
+            ftype = 'list:string'
+        elif ftype == 'integer' and 'multiple' in has:
+            ftype = 'list:integer'
+        elif name == 'password':
+            ftype = 'password'
+        s += "    Field('%s', type='%s'" % (name, ftype)

        ### determine field attributes
        if 'notnull' in has or 'notempty' in has or 'required' in has:
-            s+=', notnull=True'
+            s += ', notnull=True'
        if 'unique' in has:
-            s+=', unique=True'
-        if ftype=='boolean' and 'true' in has:
-            s+=",\n          default=True"
+            s += ', unique=True'
+        if ftype == 'boolean' and 'true' in has:
+            s += ",\n          default=True"

        ### determine field representation
        elif 'wiki' in has:
-            s+=",\n          represent=lambda x, row: MARKMIN(x)"
-            s+=",\n          comment='WIKI (markmin)'"
+            s += ",\n          represent=lambda x, row: MARKMIN(x)"
+            s += ",\n          comment='WIKI (markmin)'"
        elif 'html' in has:
-            s+=",\n          represent=lambda x, row: XML(x,sanitize=True)"
-            s+=",\n          comment='HTML (sanitized)'"
+            s += ",\n          represent=lambda x, row: XML(x,sanitize=True)"
+            s += ",\n          comment='HTML (sanitized)'"
        ### determine field access
-        if name=='password' or 'writeonly' in has:
-            s+=",\n          readable=False"
+        if name == 'password' or 'writeonly' in has:
+            s += ",\n          readable=False"
        elif 'hidden' in has:
-            s+=",\n          writable=False, readable=False"
+            s += ",\n          writable=False, readable=False"
        elif 'readonly' in has:
-            s+=",\n          writable=False"
+            s += ",\n          writable=False"

        ### make up a label
-        s+=",\n          label=T('%s')),\n" % \
+        s += ",\n          label=T('%s')),\n" % \
            ' '.join(x.capitalize() for x in barename.split('_'))
-    if table=='auth_user':
-        s+="    Field('created_on','datetime',default=request.now,\n"
-        s+="          label=T('Created On'),writable=False,readable=False),\n"
-        s+="    Field('modified_on','datetime',default=request.now,\n"
-        s+="          label=T('Modified On'),writable=False,readable=False,\n"
-        s+="          update=request.now),\n"
-        s+="    Field('registration_key',default='',\n"
-        s+="          writable=False,readable=False),\n"
-        s+="    Field('reset_password_key',default='',\n"
-        s+="          writable=False,readable=False),\n"
-        s+="    Field('registration_id',default='',\n"
-        s+="          writable=False,readable=False),\n"
+    if table == 'auth_user':
+        s += "    Field('created_on','datetime',default=request.now,\n"
+        s += "          label=T('Created On'),writable=False,readable=False),\n"
+        s += "    Field('modified_on','datetime',default=request.now,\n"
+        s += "          label=T('Modified On'),writable=False,readable=False,\n"
+        s += "          update=request.now),\n"
+        s += "    Field('registration_key',default='',\n"
+        s += "          writable=False,readable=False),\n"
+        s += "    Field('reset_password_key',default='',\n"
+        s += "          writable=False,readable=False),\n"
+        s += "    Field('registration_id',default='',\n"
+        s += "          writable=False,readable=False),\n"
    elif 'auth_user' in session.app['tables']:
-        s+="    auth.signature,\n"
-    s+="    format='%("+first_field+")s',\n"
-    s+="    migrate=settings.migrate)\n\n"
-    if table=='auth_user':
-        s+="""
-db.auth_user.first_name.requires = IS_NOT_EMPTY(error_message=auth.messages.is_empty)
-db.auth_user.last_name.requires = IS_NOT_EMPTY(error_message=auth.messages.is_empty)
-db.auth_user.password.requires = CRYPT(key=auth.settings.hmac_key, min_length=4)
+        s += "    auth.signature,\n"
+    s += "    format='%(" + first_field + ")s',\n"
+    s += "    migrate=settings.migrate)\n\n"
+    if table == 'auth_user':
+        s += """
+db.auth_user.first_name.requires = IS_NOT_EMPTY(
+    error_message=auth.messages.is_empty)
+db.auth_user.last_name.requires = IS_NOT_EMPTY(
+    error_message=auth.messages.is_empty)
+db.auth_user.password.requires = CRYPT(
+    key=auth.settings.hmac_key, min_length=4)
 db.auth_user.username.requires = IS_NOT_IN_DB(db, db.auth_user.username)
-db.auth_user.email.requires = (IS_EMAIL(error_message=auth.messages.invalid_email),
+db.auth_user.email.requires = (
+    IS_EMAIL(error_message=auth.messages.invalid_email),
                               IS_NOT_IN_DB(db, db.auth_user.email))
 """
    else:
-        s+="db.define_table('%s_archive',db.%s,Field('current_record','reference %s',readable=False,writable=False))\n" % (table,table,table)
+        s += "db.define_table('%s_archive',db.%s,Field('current_record','reference %s',readable=False,writable=False))\n" % (table, table, table)
    return s

+
 def fix_db(filename):
    params = dict(session.app['params'])
-    content = read_file(filename,'rb')
+    content = read_file(filename, 'rb')
    if 'auth_user' in session.app['tables']:
-        auth_user = make_table('auth_user',session.app['table_auth_user'])
+        auth_user = make_table('auth_user', session.app['table_auth_user'])
        content = content.replace('sqlite://storage.sqlite',
-                                params['database_uri'])
-        content = content.replace('auth.define_tables()',\
-            auth_user+'auth.define_tables(migrate = settings.migrate)')
+                                  params['database_uri'])
+        content = content.replace('auth.define_tables()',
+                                  auth_user + 'auth.define_tables(migrate = settings.migrate)')
    content += """
 mail.settings.server = settings.email_server
 mail.settings.sender = settings.email_sender
 mail.settings.login = settings.email_login
 """
-    if params['login_method']=='janrain':
-        content+="""
+    if params['login_method'] == 'janrain':
+        content += """
 from gluon.contrib.login_methods.rpx_account import RPXAccount
-auth.settings.actions_disabled=['register','change_password','request_reset_password']
+auth.settings.actions_disabled=['register','change_password',
+    'request_reset_password']
 auth.settings.login_form = RPXAccount(request,
    api_key = settings.login_config.split(':')[-1],
    domain = settings.login_config.split(':')[0],
@@ -388,14 +426,15 @@ auth.settings.login_form = RPXAccount(request,
 """
    write_file(filename, content, 'wb')

+
 def make_menu(pages):
-    s=''
-    s+='response.title = settings.title\n'
-    s+='response.subtitle = settings.subtitle\n'
-    s+="response.meta.author = '%(author)s <%(author_email)s>' % settings\n"
-    s+='response.meta.keywords = settings.keywords\n'
-    s+='response.meta.description = settings.description\n'
-    s+='response.menu = [\n'
+    s = ''
+    s += 'response.title = settings.title\n'
+    s += 'response.subtitle = settings.subtitle\n'
+    s += "response.meta.author = '%(author)s <%(author_email)s>' % settings\n"
+    s += 'response.meta.keywords = settings.keywords\n'
+    s += 'response.meta.description = settings.description\n'
+    s += 'response.menu = [\n'
    for page in pages:
        if not page.startswith('error'):
            if page.endswith('_manage'):
@@ -403,65 +442,70 @@ def make_menu(pages):
            else:
                page_name = page
            page_name = ' '.join(x.capitalize() for x in page_name.split('_'))
-            s+="(T('%s'),URL('default','%s')==URL(),URL('default','%s'),[]),\n" \
-                % (page_name,page,page)
-    s+=']'
+            s += "(T('%s'),URL('default','%s')==URL(),URL('default','%s'),[]),\n" \
+                % (page_name, page, page)
+    s += ']'
    return s

-def make_page(page,contents):
-    if 'auth_user' in session.app['tables'] and not page in ('index','error'):
-        s="@auth.requires_login()\ndef %s():\n" % page
+
+def make_page(page, contents):
+    if 'auth_user' in session.app['tables'] and not page in ('index', 'error'):
+        s = "@auth.requires_login()\ndef %s():\n" % page
    else:
-        s="def %s():\n" % page
-    items = page.rsplit('_',1)
-    if items[0] in session.app['tables'] and len(items)==2 and items[1]=='manage':
-        s+="    form = SQLFORM.smartgrid(db.t_%s,onupdate=auth.archive)\n" % items[0]
-        s+="    return locals()\n\n"
+        s = "def %s():\n" % page
+    items = page.rsplit('_', 1)
+    if items[0] in session.app['tables'] and len(items) == 2 and items[1] == 'manage':
+        s += "    form = SQLFORM.smartgrid(db.t_%s,onupdate=auth.archive)\n" % items[0]
+        s += "    return locals()\n\n"
    else:
-        s+="    return dict()\n\n"
+        s += "    return dict()\n\n"
    return s

-def make_view(page,contents):
-    s="{{extend 'layout.html'}}\n\n"
-    s+=str(MARKMIN(contents))
+
+def make_view(page, contents):
+    s = "{{extend 'layout.html'}}\n\n"
+    s += str(MARKMIN(contents))
    return s

+
 def populate(tables):
    s = 'from gluon.contrib.populate import populate\n'
-    s+= 'if db(db.auth_user).isempty():\n'
+    s += 'if db(db.auth_user).isempty():\n'
    for table in sort_tables(tables):
-        t=table=='auth_user' and 'auth_user' or 't_'+table
-        s+="     populate(db.%s,10)\n" % t
+        t = table == 'auth_user' and 'auth_user' or 't_' + table
+        s += "     populate(db.%s,10)\n" % t
    return s

+
 def create(options):
    if DEMO_MODE:
        session.flash = T('disabled in demo mode')
        redirect(URL('step6'))
    params = dict(session.app['params'])
    app = session.app['name']
-    if app_create(app,request,force=True,key=params['security_key']):
+    if app_create(app, request, force=True, key=params['security_key']):
        if MULTI_USER_MODE:
-            db.app.insert(name=app,owner=auth.user.id)
+            db.app.insert(name=app, owner=auth.user.id)
    else:
        session.flash = 'Failure to create application'
        redirect(URL('step6'))

    ### save metadata in newapp/wizard.metadata
    try:
-        meta = os.path.join(request.folder,'..',app,'wizard.metadata')
-        file=open(meta,'wb')
-        pickle.dump(session.app,file)
+        meta = os.path.join(request.folder, '..', app, 'wizard.metadata')
+        file = open(meta, 'wb')
+        pickle.dump(session.app, file)
        file.close()
    except IOError:
        session.flash = 'Failure to write wizard metadata'
        redirect(URL('step6'))

    ### apply theme
-    if options.apply_layout and params['layout_theme']!='Default':
+    if options.apply_layout and params['layout_theme'] != 'Default':
        try:
            fn = 'web2py.plugin.layout_%s.w2p' % params['layout_theme']
-            theme = urllib.urlopen(LAYOUTS_APP+'/static/plugin_layouts/plugins/'+fn)
+            theme = urllib.urlopen(
+                LAYOUTS_APP + '/static/plugin_layouts/plugins/' + fn)
            plugin_install(app, theme, request, fn)
        except:
            session.flash = T("unable to download layout")
@@ -469,55 +513,58 @@ def create(options):
    ### apply plugins
    for plugin in params['plugins']:
        try:
-            plugin_name = 'web2py.plugin.'+plugin+'.w2p'
-            stream = urllib.urlopen(PLUGINS_APP+'/static/'+plugin_name)
+            plugin_name = 'web2py.plugin.' + plugin + '.w2p'
+            stream = urllib.urlopen(PLUGINS_APP + '/static/' + plugin_name)
            plugin_install(app, stream, request, plugin_name)
        except Exception, e:
            session.flash = T("unable to download plugin: %s" % plugin)

    ### write configuration file into newapp/models/0.py
-    model = os.path.join(request.folder,'..',app,'models','0.py')
+    model = os.path.join(request.folder, '..', app, 'models', '0.py')
    file = open(model, 'wb')
    try:
        file.write("from gluon.storage import Storage\n")
        file.write("settings = Storage()\n\n")
        file.write("settings.migrate = True\n")
-        for key,value in session.app['params']:
-            file.write("settings.%s = %s\n" % (key,repr(value)))
+        for key, value in session.app['params']:
+            file.write("settings.%s = %s\n" % (key, repr(value)))
    finally:
        file.close()

    ### write configuration file into newapp/models/menu.py
    if options.generate_menu:
-        model = os.path.join(request.folder,'..',app,'models','menu.py')
-        file = open(model,'wb')
+        model = os.path.join(request.folder, '..', app, 'models', 'menu.py')
+        file = open(model, 'wb')
        try:
            file.write(make_menu(session.app['pages']))
        finally:
            file.close()

    ### customize the auth_user table
-    model = os.path.join(request.folder,'..',app,'models','db.py')
+    model = os.path.join(request.folder, '..', app, 'models', 'db.py')
    fix_db(model)

    ### create newapp/models/db_wizard.py
    if options.generate_model:
-        model = os.path.join(request.folder,'..',app,'models','db_wizard.py')
-        file = open(model,'wb')
+        model = os.path.join(
+            request.folder, '..', app, 'models', 'db_wizard.py')
+        file = open(model, 'wb')
        try:
            file.write('### we prepend t_ to tablenames and f_ to fieldnames for disambiguity\n\n')
            tables = sort_tables(session.app['tables'])
            for table in tables:
-                if table=='auth_user': continue
-                file.write(make_table(table,session.app['table_'+table]))
+                if table == 'auth_user':
+                    continue
+                file.write(make_table(table, session.app['table_' + table]))
        finally:
            file.close()

-    model = os.path.join(request.folder,'..',app,
-                         'models','db_wizard_populate.py')
-    if os.path.exists(model): os.unlink(model)
+    model = os.path.join(request.folder, '..', app,
+                         'models', 'db_wizard_populate.py')
+    if os.path.exists(model):
+        os.unlink(model)
    if options.populate_database and session.app['tables']:
-        file = open(model,'wb')
+        file = open(model, 'wb')
        try:
            file.write(populate(session.app['tables']))
        finally:
@@ -525,8 +572,9 @@ def create(options):

    ### create newapp/controllers/default.py
    if options.generate_controller:
-        controller = os.path.join(request.folder,'..',app,'controllers','default.py')
-        file = open(controller,'wb')
+        controller = os.path.join(
+            request.folder, '..', app, 'controllers', 'default.py')
+        file = open(controller, 'wb')
        try:
            file.write("""# -*- coding: utf-8 -*-
 ### required - do no delete
@@ -536,23 +584,24 @@ def call(): return service()
 ### end requires
 """)
            for page in session.app['pages']:
-                file.write(make_page(page,session.app.get('page_'+page,'')))
+                file.write(
+                    make_page(page, session.app.get('page_' + page, '')))
        finally:
            file.close()

    ### create newapp/views/default/*.html
    if options.generate_views:
        for page in session.app['pages']:
-            view = os.path.join(request.folder,'..',app,'views','default',page+'.html')
-            file = open(view,'wb')
+            view = os.path.join(
+                request.folder, '..', app, 'views', 'default', page + '.html')
+            file = open(view, 'wb')
            try:
-                file.write(make_view(page,session.app.get('page_'+page,'')))
+                file.write(
+                    make_view(page, session.app.get('page_' + page, '')))
            finally:
                file.close()

    if options.erase_database:
-        path = os.path.join(request.folder,'..',app,'databases','*')
+        path = os.path.join(request.folder, '..', app, 'databases', '*')
        for file in glob.glob(path):
            os.unlink(file)
-
-
--- a/applications/admin/cron/expire_sessions.py
+++ b/applications/admin/cron/expire_sessions.py
@@ -1,10 +1,10 @@
 EXPIRATION_MINUTES=60
 DIGITS=('0','1','2','3','4','5','6','7','8','9')
 import os, time, stat, cPickle, logging
-path=os.path.join(request.folder,'sessions')
+path = os.path.join(request.folder,'sessions')
 if not os.path.exists(path):
    os.mkdir(path)
-now=time.time()
+now = time.time()
 for filename in os.listdir(path):
    fullpath=os.path.join(path,filename)
    if os.path.isfile(fullpath) and filename.startswith(DIGITS):
@@ -18,6 +18,4 @@ for filename in os.listdir(path):
            if (now - filetime) > expiration:
                os.unlink(fullpath)
        except:
-            logging.exception('failure to check %s'%fullpath)
-
-
+            logging.exception('failure to check %s' % fullpath)
--- a/applications/admin/languages/cs.py
+++ b/applications/admin/languages/cs.py
@@ -0,0 +1,480 @@
+# coding: utf8
+{
+'!langcode!': 'cs-cz',
+'!langname!': 'čeština',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': 'Kolonka "Upravit" je nepovinný výraz, například "pole1=\'nováhodnota\'". Výsledky databázového JOINu nemůžete mazat ani upravovat.',
+'"User Exception" debug mode. An error ticket could be issued!': '"User Exception" debug mode. An error ticket could be issued!',
+'%%{Row} in Table': '%%{řádek} v tabulce',
+'%%{Row} selected': 'označených %%{řádek}',
+'%s %%{row} deleted': '%s smazaných %%{záznam}',
+'%s %%{row} updated': '%s upravených %%{záznam}',
+'%s selected': '%s označených',
+'%Y-%m-%d': '%d.%m.%Y',
+'%Y-%m-%d %H:%M:%S': '%d.%m.%Y %H:%M:%S',
+'(requires internet access)': '(vyžaduje připojení k internetu)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
+'(something like "it-it")': '(například "cs-cs")',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(soubor **gluon/contrib/plural_rules/%s.py** nenalezen)',
+'@markmin\x01Searching: **%s** %%{file}': 'Hledání: **%s** %%{soubor}',
+'About': 'O programu',
+'About application': 'O aplikaci',
+'Access Control': 'Řízení přístupu',
+'Add breakpoint': 'Přidat bod přerušení',
+'Additional code for your application': 'Další kód pro Vaši aplikaci',
+'Admin design page': 'Admin design page',
+'Admin language': 'jazyk rozhraní',
+'Administrative interface': 'pro administrátorské rozhraní klikněte sem',
+'Administrative Interface': 'Administrátorské rozhraní',
+'administrative interface': 'rozhraní pro správu',
+'Administrator Password:': 'Administrátorské heslo:',
+'Ajax Recipes': 'Recepty s ajaxem',
+'An error occured, please %s the page': 'An error occured, please %s the page',
+'and rename it:': 'a přejmenovat na:',
+'appadmin': 'appadmin',
+'appadmin is disabled because insecure channel': 'appadmin je zakázaná bez zabezpečeného spojení',
+'Application': 'Application',
+'application "%s" uninstalled': 'application "%s" odinstalována',
+'application compiled': 'aplikace zkompilována',
+'Application name:': 'Název aplikace:',
+'are not used': 'nepoužita',
+'are not used yet': 'ještě nepoužita',
+'Are you sure you want to delete this object?': 'Opravdu chcete odstranit tento objekt?',
+'Are you sure you want to uninstall application "%s"?': 'Opravdu chcete odinstalovat aplikaci "%s"?',
+'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'Available Databases and Tables': 'Dostupné databáze a tabulky',
+'back': 'zpět',
+'Back to wizard': 'Back to wizard',
+'Basics': 'Basics',
+'Begin': 'Začít',
+'breakpoint': 'bod přerušení',
+'Breakpoints': 'Body přerušení',
+'breakpoints': 'body přerušení',
+'Buy this book': 'Koupit web2py knihu',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Keys': 'Klíče cache',
+'cache, errors and sessions cleaned': 'cache, chyby a relace byly pročištěny',
+'can be a git repo': 'může to být git repo',
+'Cancel': 'Storno',
+'Cannot be empty': 'Nemůže být prázdné',
+'Change Admin Password': 'Změnit heslo pro správu',
+'Change admin password': 'Změnit heslo pro správu aplikací',
+'Change password': 'Změna hesla',
+'check all': 'vše označit',
+'Check for upgrades': 'Zkusit aktualizovat',
+'Check to delete': 'Označit ke smazání',
+'Check to delete:': 'Označit ke smazání:',
+'Checking for upgrades...': 'Zjišťuji, zda jsou k dispozici aktualizace...',
+'Clean': 'Pročistit',
+'Clear CACHE?': 'Vymazat CACHE?',
+'Clear DISK': 'Vymazat DISK',
+'Clear RAM': 'Vymazat RAM',
+'Click row to expand traceback': 'Pro rozbalení stopy, klikněte na řádek',
+'Click row to view a ticket': 'Pro zobrazení chyby (ticketu), klikněte na řádku...',
+'Client IP': 'IP adresa klienta',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'vše sbalit/rozbalit',
+'Community': 'Komunita',
+'Compile': 'Zkompilovat',
+'compiled application removed': 'zkompilovaná aplikace smazána',
+'Components and Plugins': 'Komponenty a zásuvné moduly',
+'Condition': 'Podmínka',
+'continue': 'continue',
+'Controller': 'Kontrolér (Controller)',
+'Controllers': 'Kontroléry',
+'controllers': 'kontroléry',
+'Copyright': 'Copyright',
+'Count': 'Počet',
+'Create': 'Vytvořit',
+'create file with filename:': 'vytvořit soubor s názvem:',
+'created by': 'vytvořil',
+'Created By': 'Vytvořeno - kým',
+'Created On': 'Vytvořeno - kdy',
+'crontab': 'crontab',
+'Current request': 'Aktuální požadavek',
+'Current response': 'Aktuální odpověď',
+'Current session': 'Aktuální relace',
+'currently running': 'právě běží',
+'currently saved or': 'uloženo nebo',
+'customize me!': 'upravte mě!',
+'data uploaded': 'data nahrána',
+'Database': 'Rozhraní databáze',
+'Database %s select': 'databáze %s výběr',
+'Database administration': 'Database administration',
+'database administration': 'správa databáze',
+'Date and Time': 'Datum a čas',
+'day': 'den',
+'db': 'db',
+'DB Model': 'Databázový model',
+'Debug': 'Ladění',
+'defines tables': 'defines tables',
+'Delete': 'Smazat',
+'delete': 'smazat',
+'delete all checked': 'smazat vše označené',
+'delete plugin': 'delete plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Smazat tento soubor (budete požádán o potvrzení mazání)',
+'Delete:': 'Smazat:',
+'deleted after first hit': 'smazat po prvním dosažení',
+'Demo': 'Demo',
+'Deploy': 'Nahrát',
+'Deploy on Google App Engine': 'Nahrát na Google App Engine',
+'Deploy to OpenShift': 'Nahrát na OpenShift',
+'Deployment Recipes': 'Postupy pro deployment',
+'Description': 'Popis',
+'design': 'návrh',
+'Detailed traceback description': 'Podrobný výpis prostředí',
+'details': 'podrobnosti',
+'direction: ltr': 'směr: ltr',
+'Disable': 'Zablokovat',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Klíče diskové cache',
+'Disk Cleared': 'Disk smazán',
+'docs': 'dokumentace',
+'Documentation': 'Dokumentace',
+"Don't know what to do?": 'Nevíte kudy kam?',
+'done!': 'hotovo!',
+'Download': 'Stáhnout',
+'download layouts': 'stáhnout moduly rozvržení stránky',
+'download plugins': 'stáhnout zásuvné moduly',
+'E-mail': 'E-mail',
+'Edit': 'Upravit',
+'edit all': 'edit all',
+'Edit application': 'Správa aplikace',
+'edit controller': 'edit controller',
+'Edit current record': 'Upravit aktuální záznam',
+'Edit Profile': 'Upravit profil',
+'edit views:': 'upravit pohled:',
+'Editing file "%s"': 'Úprava souboru "%s"',
+'Editing Language file': 'Úprava jazykového souboru',
+'Editing Plural Forms File': 'Editing Plural Forms File',
+'Email and SMS': 'Email a SMS',
+'Enable': 'Odblokovat',
+'enter a number between %(min)g and %(max)g': 'zadejte číslo mezi %(min)g a %(max)g',
+'enter an integer between %(min)g and %(max)g': 'zadejte celé číslo mezi %(min)g a %(max)g',
+'Error': 'Chyba',
+'Error logs for "%(app)s"': 'Seznam výskytu chyb pro aplikaci "%(app)s"',
+'Error snapshot': 'Snapshot chyby',
+'Error ticket': 'Ticket chyby',
+'Errors': 'Chyby',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Prvky instance výjimky',
+'Expand Abbreviation': 'Expand Abbreviation',
+'export as csv file': 'exportovat do .csv souboru',
+'exposes': 'vystavuje',
+'exposes:': 'vystavuje funkce:',
+'extends': 'rozšiřuje',
+'failed to compile file because:': 'soubor se nepodařilo zkompilovat, protože:',
+'FAQ': 'Často kladené dotazy',
+'File': 'Soubor',
+'file': 'soubor',
+'file "%(filename)s" created': 'file "%(filename)s" created',
+'file saved on %(time)s': 'soubor uložen %(time)s',
+'file saved on %s': 'soubor uložen %s',
+'Filename': 'Název souboru',
+'filter': 'filtr',
+'Find Next': 'Najít další',
+'Find Previous': 'Najít předchozí',
+'First name': 'Křestní jméno',
+'Forgot username?': 'Zapomněl jste svoje přihlašovací jméno?',
+'forgot username?': 'zapomněl jste svoje přihlašovací jméno?',
+'Forms and Validators': 'Formuláře a validátory',
+'Frames': 'Frames',
+'Free Applications': 'Aplikace zdarma',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'Generate': 'Vytvořit',
+'Get from URL:': 'Stáhnout z internetu:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Globals##debug': 'Globální proměnné',
+'go!': 'OK!',
+'Goto': 'Goto',
+'graph model': 'graph model',
+'Group %(group_id)s created': 'Skupina %(group_id)s vytvořena',
+'Group ID': 'ID skupiny',
+'Groups': 'Skupiny',
+'Hello World': 'Ahoj světe',
+'Help': 'Nápověda',
+'Hide/Show Translated strings': 'Skrýt/Zobrazit přeložené texty',
+'Hits': 'Kolikrát dosaženo',
+'Home': 'Domovská stránka',
+'honored only if the expression evaluates to true': 'brát v potaz jen když se tato podmínka vyhodnotí kladně',
+'How did you get here?': 'Jak jste se sem vlastně dostal?',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'import': 'import',
+'Import/Export': 'Import/Export',
+'includes': 'zahrnuje',
+'Index': 'Index',
+'insert new': 'vložit nový záznam ',
+'insert new %s': 'vložit nový záznam %s',
+'inspect attributes': 'inspect attributes',
+'Install': 'Instalovat',
+'Installed applications': 'Nainstalované aplikace',
+'Interaction at %s line %s': 'Interakce v %s, na řádce %s',
+'Interactive console': 'Interaktivní příkazová řádka',
+'Internal State': 'Vnitřní stav',
+'Introduction': 'Úvod',
+'Invalid email': 'Neplatný email',
+'Invalid password': 'Nesprávné heslo',
+'invalid password.': 'neplatné heslo',
+'Invalid Query': 'Neplatný dotaz',
+'invalid request': 'Neplatný požadavek',
+'Is Active': 'Je aktivní',
+'It is %s %%{day} today.': 'Dnes je to %s %%{den}.',
+'Key': 'Klíč',
+'Key bindings': 'Vazby klíčů',
+'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
+'languages': 'jazyky',
+'Languages': 'Jazyky',
+'Last name': 'Příjmení',
+'Last saved on:': 'Naposledy uloženo:',
+'Layout': 'Rozvržení stránky (layout)',
+'Layout Plugins': 'Moduly rozvržení stránky (Layout Plugins)',
+'Layouts': 'Rozvržení stránek',
+'License for': 'Licence pro',
+'Line number': 'Číslo řádku',
+'LineNo': 'Č.řádku',
+'Live Chat': 'Online pokec',
+'loading...': 'nahrávám...',
+'locals': 'locals',
+'Locals##debug': 'Lokální proměnné',
+'Logged in': 'Přihlášení proběhlo úspěšně',
+'Logged out': 'Odhlášení proběhlo úspěšně',
+'Login': 'Přihlásit se',
+'login': 'přihlásit se',
+'Login to the Administrative Interface': 'Přihlásit se do Správce aplikací',
+'logout': 'odhlásit se',
+'Logout': 'Odhlásit se',
+'Lost Password': 'Zapomněl jste heslo',
+'Lost password?': 'Zapomněl jste heslo?',
+'lost password?': 'zapomněl jste heslo?',
+'Manage': 'Manage',
+'Manage Cache': 'Manage Cache',
+'Menu Model': 'Model rozbalovací nabídky',
+'Models': 'Modely',
+'models': 'modely',
+'Modified By': 'Změněno - kým',
+'Modified On': 'Změněno - kdy',
+'Modules': 'Moduly',
+'modules': 'moduly',
+'My Sites': 'Správa aplikací',
+'Name': 'Jméno',
+'new application "%s" created': 'nová aplikace "%s" vytvořena',
+'New Application Wizard': 'Nový průvodce aplikací',
+'New application wizard': 'Nový průvodce aplikací',
+'New password': 'Nové heslo',
+'New Record': 'Nový záznam',
+'new record inserted': 'nový záznam byl založen',
+'New simple application': 'Vytvořit primitivní aplikaci',
+'next': 'next',
+'next 100 rows': 'dalších 100 řádků',
+'No databases in this application': 'V této aplikaci nejsou žádné databáze',
+'No Interaction yet': 'Ještě žádná interakce nenastala',
+'No ticket_storage.txt found under /private folder': 'Soubor ticket_storage.txt v adresáři /private nenalezen',
+'Object or table name': 'Objekt či tabulka',
+'Old password': 'Původní heslo',
+'online designer': 'online návrhář',
+'Online examples': 'Příklady online',
+'Open new app in new window': 'Open new app in new window',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
+'or import from csv file': 'nebo importovat z .csv souboru',
+'Origin': 'Původ',
+'Original/Translation': 'Originál/Překlad',
+'Other Plugins': 'Ostatní moduly',
+'Other Recipes': 'Ostatní zásuvné moduly',
+'Overview': 'Přehled',
+'Overwrite installed app': 'Přepsat instalovanou aplikaci',
+'Pack all': 'Zabalit',
+'Pack compiled': 'Zabalit zkompilované',
+'pack plugin': 'pack plugin',
+'password': 'heslo',
+'Password': 'Heslo',
+"Password fields don't match": 'Hesla se neshodují',
+'Peeking at file': 'Peeking at file',
+'Please': 'Prosím',
+'Plugin "%s" in application': 'Plugin "%s" in application',
+'plugins': 'zásuvné moduly',
+'Plugins': 'Zásuvné moduly',
+'Plural Form #%s': 'Plural Form #%s',
+'Plural-Forms:': 'Množná čísla:',
+'Powered by': 'Poháněno',
+'Preface': 'Předmluva',
+'previous 100 rows': 'předchozích 100 řádků',
+'Private files': 'Soukromé soubory',
+'private files': 'soukromé soubory',
+'profile': 'profil',
+'Project Progress': 'Vývoj projektu',
+'Python': 'Python',
+'Query:': 'Dotaz:',
+'Quick Examples': 'Krátké příklady',
+'RAM': 'RAM',
+'RAM Cache Keys': 'Klíče RAM Cache',
+'Ram Cleared': 'RAM smazána',
+'Readme': 'Nápověda',
+'Recipes': 'Postupy jak na to',
+'Record': 'Záznam',
+'record does not exist': 'záznam neexistuje',
+'Record ID': 'ID záznamu',
+'Record id': 'id záznamu',
+'refresh': 'obnovte',
+'register': 'registrovat',
+'Register': 'Zaregistrovat se',
+'Registration identifier': 'Registrační identifikátor',
+'Registration key': 'Registrační klíč',
+'reload': 'reload',
+'Reload routes': 'Znovu nahrát cesty',
+'Remember me (for 30 days)': 'Zapamatovat na 30 dní',
+'Remove compiled': 'Odstranit zkompilované',
+'Removed Breakpoint on %s at line %s': 'Bod přerušení smazán - soubor %s na řádce %s',
+'Replace': 'Zaměnit',
+'Replace All': 'Zaměnit vše',
+'request': 'request',
+'Reset Password key': 'Reset registračního klíče',
+'response': 'response',
+'restart': 'restart',
+'restore': 'obnovit',
+'Retrieve username': 'Získat přihlašovací jméno',
+'return': 'return',
+'revert': 'vrátit se k původnímu',
+'Role': 'Role',
+'Rows in Table': 'Záznamy v tabulce',
+'Rows selected': 'Záznamů zobrazeno',
+'rules are not defined': 'pravidla nejsou definována',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Spustí testy v tomto souboru (ke spuštění všech testů, použijte tlačítko 'test')",
+'Running on %s': 'Běží na %s',
+'Save': 'Uložit',
+'Save file:': 'Save file:',
+'Save via Ajax': 'Uložit pomocí Ajaxu',
+'Saved file hash:': 'hash uloženého souboru:',
+'Semantic': 'Modul semantic',
+'Services': 'Služby',
+'session': 'session',
+'session expired': 'session expired',
+'Set Breakpoint on %s at line %s: %s': 'Bod přerušení nastaven v souboru %s na řádce %s: %s',
+'shell': 'příkazová řádka',
+'Singular Form': 'Singular Form',
+'Site': 'Správa aplikací',
+'Size of cache:': 'Velikost cache:',
+'skip to generate': 'skip to generate',
+'Sorry, could not find mercurial installed': 'Bohužel mercurial není nainstalován.',
+'Start a new app': 'Vytvořit novou aplikaci',
+'Start searching': 'Začít hledání',
+'Start wizard': 'Spustit průvodce',
+'state': 'stav',
+'Static': 'Static',
+'static': 'statické soubory',
+'Static files': 'Statické soubory',
+'Statistics': 'Statistika',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
+'Stylesheet': 'CSS styly',
+'submit': 'odeslat',
+'Submit': 'Odeslat',
+'successful': 'úspěšně',
+'Support': 'Podpora',
+'Sure you want to delete this object?': 'Opravdu chcete smazat tento objekt?',
+'Table': 'tabulka',
+'Table name': 'Název tabulky',
+'Temporary': 'Dočasný',
+'test': 'test',
+'Testing application': 'Testing application',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Dotaz" je podmínka, například "db.tabulka1.pole1==\'hodnota\'". Podmínka "db.tabulka1.pole1==db.tabulka2.pole2" pak vytvoří SQL JOIN.',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika aplikace: každá URL je mapována na funkci vystavovanou kontrolérem.',
+'The Core': 'Jádro (The Core)',
+'The data representation, define database tables and sets': 'Reprezentace dat: definovat tabulky databáze a záznamy',
+'The output of the file is a dictionary that was rendered by the view %s': 'Výstup ze souboru je slovník, který se zobrazil v pohledu %s.',
+'The presentations layer, views are also known as templates': 'Prezentační vrstva: pohledy či templaty (šablony)',
+'The Views': 'Pohledy (The Views)',
+'There are no controllers': 'There are no controllers',
+'There are no modules': 'There are no modules',
+'There are no plugins': 'Žádné moduly nejsou instalovány.',
+'There are no private files': 'Žádné soukromé soubory neexistují.',
+'There are no static files': 'There are no static files',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'There are no views',
+'These files are not served, they are only available from within your app': 'Tyto soubory jsou klientům nepřístupné. K dispozici jsou pouze v rámci aplikace.',
+'These files are served without processing, your images go here': 'Tyto soubory jsou servírovány bez přídavné logiky, sem patří např. obrázky.',
+'This App': 'Tato aplikace',
+'This is a copy of the scaffolding application': 'Toto je kopie aplikace skelet.',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'This is the %(filename)s template',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'tuto stránku, abyste uviděli, zda se dosáhlo bodu přerušení.',
+'Ticket': 'Ticket',
+'Ticket ID': 'Ticket ID',
+'Time in Cache (h:m:s)': 'Čas v Cache (h:m:s)',
+'Timestamp': 'Časové razítko',
+'to  previous version.': 'k předchozí verzi.',
+'To create a plugin, name a file/folder plugin_[name]': 'Zásuvný modul vytvoříte tak, že pojmenujete soubor/adresář plugin_[jméno modulu]',
+'To emulate a breakpoint programatically, write:': 'K nastavení bodu přerušení v kódu programu, napište:',
+'to use the debugger!': ', abyste mohli ladící program používat!',
+'toggle breakpoint': 'vyp./zap. bod přerušení',
+'Toggle Fullscreen': 'Na celou obrazovku a zpět',
+'too short': 'Příliš krátké',
+'Traceback': 'Traceback',
+'Translation strings for the application': 'Překlad textů pro aplikaci',
+'try something like': 'try something like',
+'Try the mobile interface': 'Zkuste rozhraní pro mobilní zařízení',
+'try view': 'try view',
+'Twitter': 'Twitter',
+'Type python statement in here and hit Return (Enter) to execute it.': 'Type python statement in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Unable to check for upgrades',
+'unable to parse csv file': 'csv soubor nedá sa zpracovat',
+'uncheck all': 'vše odznačit',
+'Uninstall': 'Odinstalovat',
+'update': 'aktualizovat',
+'update all languages': 'aktualizovat všechny jazyky',
+'Update:': 'Upravit:',
+'Upgrade': 'Upgrade',
+'upgrade now': 'upgrade now',
+'upgrade now to %s': 'upgrade now to %s',
+'upload': 'nahrát',
+'Upload': 'Upload',
+'Upload a package:': 'Nahrát balík:',
+'Upload and install packed application': 'Nahrát a instalovat zabalenou aplikaci',
+'upload file:': 'nahrát soubor:',
+'upload plugin file:': 'nahrát soubor modulu:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Použijte (...)&(...) pro AND, (...)|(...) pro OR a ~(...) pro NOT pro sestavení složitějších dotazů.',
+'User %(id)s Logged-in': 'Uživatel %(id)s přihlášen',
+'User %(id)s Logged-out': 'Uživatel %(id)s odhlášen',
+'User %(id)s Password changed': 'Uživatel %(id)s změnil heslo',
+'User %(id)s Profile updated': 'Uživatel %(id)s upravil profil',
+'User %(id)s Registered': 'Uživatel %(id)s se zaregistroval',
+'User %(id)s Username retrieved': 'Uživatel %(id)s si nachal zaslat přihlašovací jméno',
+'User ID': 'ID uživatele',
+'Username': 'Přihlašovací jméno',
+'variables': 'variables',
+'Verify Password': 'Zopakujte heslo',
+'Version': 'Verze',
+'Version %s.%s.%s (%s) %s': 'Verze %s.%s.%s (%s) %s',
+'Versioning': 'Verzování',
+'Videos': 'Videa',
+'View': 'Pohled (View)',
+'Views': 'Pohledy',
+'views': 'pohledy',
+'Web Framework': 'Web Framework',
+'web2py is up to date': 'Máte aktuální verzi web2py.',
+'web2py online debugger': 'Ladící online web2py program',
+'web2py Recent Tweets': 'Štěbetání na Twitteru o web2py',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome': 'Vítejte',
+'Welcome to web2py': 'Vitejte ve web2py',
+'Welcome to web2py!': 'Vítejte ve web2py!',
+'Which called the function %s located in the file %s': 'která zavolala funkci %s v souboru (kontroléru) %s.',
+'You are successfully running web2py': 'Úspěšně jste spustili web2py.',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Nastavovat a mazat body přerušení je též možno v rámci editování zdrojového souboru přes tlačítko Vyp./Zap. bod přerušení',
+'You can modify this application and adapt it to your needs': 'Tuto aplikaci si můžete upravit a přizpůsobit ji svým potřebám.',
+'You need to set up and reach a': 'Je třeba nejprve nastavit a dojít až na',
+'You visited the url %s': 'Navštívili jste stránku %s,',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Aplikace bude blokována než se klikne na jedno z tlačítek (další, krok, pokračovat, atd.)',
+'Your can inspect variables using the console bellow': 'Níže pomocí příkazové řádky si můžete prohlédnout proměnné',
+}
--- a/applications/admin/languages/de.py
+++ b/applications/admin/languages/de.py
@@ -3,54 +3,62 @@
 '!langcode!': 'de',
 '!langname!': 'Deutsch',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"Update" ist ein optionaler Ausdruck wie "Feld1 = \'newvalue". JOIN Ergebnisse können nicht aktualisiert oder gelöscht werden',
-'%s %%{row} deleted': '%s Zeilen gelöscht',
-'%s %%{row} updated': '%s Zeilen aktualisiert',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access)': '(requires internet access)',
+'%s %%{row} deleted': '%s %%{row} Zeilen gelöscht',
+'%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)',
 '(something like "it-it")': '(so etwas wie "it-it")',
-'@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@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': 'Additional code for your application',
-'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',
+'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',
 'Admin is disabled because insecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
 'Admin is disabled because unsecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
-'Admin language': 'Admin language',
-'administrative interface': 'administrative interface',
+'Admin language': 'Admin-Sprache',
+'administrative interface': 'Administrative Schnittstelle',
 'Administrator Password:': 'Administrator Passwort:',
+'An error occured, please %s the page': 'Ein Fehler ist aufgetereten, bitte %s die Seite',
 'and rename it (required):': 'und benenne sie um (erforderlich):',
 'and rename it:': ' und benenne sie um:',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
+'Application': 'Anwendung',
 'application "%s" uninstalled': 'Anwendung "%s" deinstalliert',
 'application compiled': 'Anwendung kompiliert',
 'application is compiled and cannot be designed': 'Die Anwendung ist kompiliert kann deswegen nicht mehr geändert werden',
-'Application name:': 'Application name:',
+'Application name:': 'Name der Applikation:',
+'are not used': 'wird nicht verwendet',
+'are not used yet': 'wird 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?': 'Are you sure you want to delete this object?',
+'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.',
 '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',
+'Available databases and tables': 'verfügbare Datenbanken und Tabellen',
 'back': 'zurück',
-'beautify': 'beautify',
-'cache': 'Cache',
+'beautify': 'verschönern',
+'cache': 'Pufferspeicher',
 'cache, errors and sessions cleaned': 'Zwischenspeicher (cache), Fehler und Sitzungen (sessions) gelöscht',
-'call': 'call',
-'can be a git repo': 'can be a git repo',
+'call': 'Aufruf',
+'can be a git repo': 'kann ein git Repository sein',
+'Cancel': 'Cancel',
 '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 create file': 'Kann Datei nicht erstellen',
@@ -62,29 +70,31 @@
 'Check for upgrades': 'check for upgrades',
 'Check to delete': 'Markiere zum löschen',
 'Checking for upgrades...': 'Auf Updates überprüfen...',
-'Clean': 'löschen',
+'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',
 'click to check for upgrades': 'hier klicken um nach Upgrades zu suchen',
 'Client IP': 'Client IP',
 'code': 'code',
-'collapse/expand all': 'collapse/expand all',
+'collapse/expand all': 'alles zu- bzw. aufklappen',
 'Compile': 'kompilieren',
 'compiled application removed': 'kompilierte Anwendung gelöscht',
 'Controller': 'Controller',
 'Controllers': 'Controller',
 'controllers': 'Controllers',
 'Copyright': 'Urheberrecht',
+'Count': 'Anzahl',
 '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': 'created by',
+'created by': 'erstellt von',
 'crontab': 'crontab',
 'Current request': 'Aktuelle Anfrage (request)',
 'Current response': 'Aktuelle Antwort (response)',
 'Current session': 'Aktuelle Sitzung (session)',
-'currently running': 'currently running',
+'currently running': 'aktuell in Betrieb',
 'currently saved or': 'des derzeit gespeicherten oder',
 'customize me!': 'pass mich an!',
 'data uploaded': 'Daten hochgeladen',
@@ -97,23 +107,27 @@
 'DB Model': 'DB Modell',
 'Debug': 'Debug',
 'defines tables': 'definiere Tabellen',
-'Delete': 'Löschen',
+'Delete': 'löschen',
 'delete': 'löschen',
 'delete all checked': 'lösche alle markierten',
 'delete plugin': 'Plugin löschen',
-'Delete:': 'Löschen:',
-'Deploy': 'deploy',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'löschen:',
+'Deploy': 'Installieren',
 'Deploy on Google App Engine': 'Auf Google App Engine installieren',
-'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to OpenShift': 'Auf OpenShift installieren',
 'Description': 'Beschreibung',
 'design': 'design',
 'DESIGN': 'design',
 'Design for': 'Design für',
+'Detailed traceback description': 'Detailed traceback description',
 'direction: ltr': 'direction: ltr',
-'Disable': 'Disable',
+'Disable': 'Deaktivieren',
+'docs': 'docs',
 'documentation': 'Dokumentation',
 'done!': 'fertig!',
-'download layouts': 'download layouts',
+'Download .w2p': 'Download .w2p',
+'download layouts': 'Layouts herunterladen',
 'download plugins': 'download plugins',
 'E-mail': 'E-mail',
 'EDIT': 'BEARBEITEN',
@@ -128,16 +142,23 @@
 'Editing file': 'Bearbeite Datei',
 'Editing file "%s"': 'Bearbeite Datei "%s"',
 'Editing Language file': 'Sprachdatei bearbeiten',
+'Enable': 'Enable',
 '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',
 'escape': 'escape',
 'Exception instance attributes': 'Atribute der Ausnahmeinstanz',
 'Expand Abbreviation': 'Kürzel erweitern',
 'export as csv file': 'Exportieren als CSV-Datei',
 'exposes': 'stellt zur Verfügung',
+'exposes:': 'exposes:',
 'extends': 'erweitert',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module': 'neu laden des Moduls fehlgeschlagen',
+'File': 'Datei',
 'file "%(filename)s" created': 'Datei "%(filename)s" erstellt',
 'file "%(filename)s" deleted': 'Datei "%(filename)s" gelöscht',
 'file "%(filename)s" uploaded': 'Datei "%(filename)s" hochgeladen',
@@ -148,25 +169,33 @@
 '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',
 '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',
+'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',
 '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 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',
 'Import/Export': 'Importieren/Exportieren',
 'includes': 'Einfügen',
 'Index': 'Index',
 'index': 'index',
-'insert new': 'neu einfügen',
-'insert new %s': 'neu einfügen %s',
+'insert new': 'neu Einfügen',
+'insert new %s': 'neu Einfügen %s',
+'inspect attributes': 'inspect attributes',
 'Install': 'installieren',
 'Installed applications': 'Installierte Anwendungen',
 'internal error': 'interner Fehler',
@@ -175,9 +204,10 @@
 'Invalid email': 'Ungültige Email',
 'invalid password': 'Ungültiges Passwort',
 'Invalid Query': 'Ungültige Abfrage',
-'invalid request': 'ungültige Anfrage',
-'invalid ticket': 'ungültiges Ticket',
+'invalid request': 'Ungültige Anfrage',
+'invalid ticket': 'Ungültiges Ticket',
 'Key bindings': 'Tastenbelegungen',
+'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
 'Key bindings for ZenConding Plugin': 'Tastenbelegungen für das ZenConding Plugin',
 'language file "%(filename)s" created/updated': 'Sprachdatei "%(filename)s" erstellt/aktualisiert',
 'Language files (static strings) updated': 'Sprachdatei (statisch Strings) aktualisiert',
@@ -189,6 +219,7 @@
 'Layout': 'Layout',
 'License for': 'Lizenz für',
 'loading...': 'lade...',
+'locals': 'locals',
 'located in the file': 'located in Datei',
 'Login': 'Anmelden',
 'login': 'anmelden',
@@ -196,7 +227,8 @@
 'Logout': 'abmelden',
 'Lost Password': 'Passwort vergessen',
 'lost password?': 'Passwort vergessen?',
-'Main Menu': 'Menú principal',
+'Main Menu': 'Menü principal',
+'Manage': 'Verwalten',
 'Match Pair': 'Paare finden',
 'Menu Model': 'Menü Modell',
 'merge': 'verbinden',
@@ -207,22 +239,29 @@
 'modules': 'Module',
 'Name': 'Name',
 'new application "%s" created': 'neue Anwendung "%s" erzeugt',
-'New application wizard': 'New application wizard',
+'New application wizard': 'Neue Anwendung per Assistent',
+'new plugin installed': 'new plugin installed',
 'New Record': 'Neuer Datensatz',
 'new record inserted': 'neuer Datensatz eingefügt',
-'New simple application': 'New simple application',
+'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:',
 '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',
+'Original/Translation': 'Original/übersetzung',
 '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',
@@ -230,9 +269,13 @@
 'Plugin "%s" in application': 'Plugin "%s" in Anwendung',
 'plugins': 'plugins',
 'Plugins': 'Plugins',
+'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Unterstützt von',
 'previous 100 rows': 'vorherige 100 zeilen',
 'Previous Edit Point': 'vorheriger Bearbeitungsschritt',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Projekt Fortschritt',
 'Query:': 'Abfrage:',
 'record': 'Datensatz',
 'record does not exist': 'Datensatz existiert nicht',
@@ -241,26 +284,39 @@
 'register': 'Registrierung',
 'Register': 'registrieren',
 'Registration key': 'Registrierungsschlüssel',
-'Reload routes': 'Reload routes',
-'Remove compiled': 'kompilat gelöscht',
+'reload': 'Neu laden',
+'Reload routes': 'Routen neu laden',
+'Remove compiled': 'Bytecode löschen',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'request': 'request',
 'Reset Password key': 'Passwortschlüssel zurücksetzen',
 'Resolve Conflict file': 'bereinige Konflikt-Datei',
+'response': 'Antwort',
 'restore': 'wiederherstellen',
 'revert': 'zurückkehren',
 'Role': 'Rolle',
 'Rows in table': 'Zeilen in Tabelle',
 'Rows selected': 'Zeilen ausgewählt',
-'Running on %s': 'Running on %s',
+'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': 'läuft auf %s',
+'Save': 'Save',
 'save': 'sichern',
+'Save file:': 'Save file:',
 'Save via Ajax': 'via Ajax sichern',
 'Saved file hash:': 'Gespeicherter Datei-Hash:',
+'Select Files to Package': 'Dateien zum Paketieren wählen',
 'selected': 'ausgewählt(e)',
-'session expired': 'Sitzung Abgelaufen',
+'session': 'Sitzung',
+'session expired': 'Sitzung abgelaufen',
 'shell': 'shell',
 'Site': 'Seite',
 'some files could not be removed': 'einige Dateien konnten nicht gelöscht werden',
-'Start wizard': 'start wizard',
+'Start searching': 'Start searching',
+'Start wizard': 'Assistent starten',
 'state': 'Status',
+'Static': 'Static',
 'static': 'statische Dateien',
 'Static files': 'statische Dateien',
 'Stylesheet': 'Stylesheet',
@@ -283,27 +339,35 @@
 '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 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': 'There are no plugins',
+'There are no plugins': 'Keine Plugins vorhanden',
+'There are no private files': 'There are no private files',
 '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 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 served without processing, your images go here': 'These files are served without processing, your images go here',
+'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': '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',
 'This is the %(filename)s template': 'Dies ist das Template %(filename)s',
 'Ticket': 'Ticket',
-'Timestamp': 'Timestamp',
+'Ticket ID': 'Ticket ID',
+'Timestamp': 'Zeitstempel',
 'TM': 'TM',
 'to  previous version.': 'zu einer früheren Version.',
 'To create a plugin, name a file/folder plugin_[name]': 'Um ein Plugin zu erstellen benennen Sie eine(n) Datei/Ordner plugin_[Name]',
-'translation strings for the application': 'Übersetzungs-Strings für die Anwendung',
-'Translation strings for the application': 'Translation strings for the application',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'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',
@@ -311,37 +375,40 @@
 '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': 'alles demarkieren',
+'uncheck all': 'Selektionen entfernen',
 'Uninstall': 'deinstallieren',
 'update': 'aktualisieren',
 'update all languages': 'aktualisiere alle Sprachen',
 'Update:': 'Aktualisiere:',
 'upgrade web2py now': 'jetzt web2py upgraden',
 'upload': 'upload',
+'Upload': 'Upload',
 'Upload & install packed application': 'Verpackte Anwendung hochladen und installieren',
-'Upload a package:': 'Upload a package:',
-'Upload and install packed application': 'Upload and install packed application',
+'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 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:': 'Use an url:',
-'user': 'user',
+'Use an url:': 'Verwende URL:',
+'user': 'Nutzer',
 'User ID': 'Benutzer ID',
-'variables': 'variables',
+'variables': 'Variablen',
 'Version': 'Version',
 'Version %s.%s.%s (%s) %s': 'Version %s.%s.%s (%s) %s',
 'versioning': 'Versionierung',
-'View': 'View',
-'view': 'View',
-'Views': 'Views',
-'views': 'Views',
+'Versioning': 'Versionierung',
+'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',
 'Welcome %s': 'Willkommen %s',
 'Welcome to web2py': 'Willkommen zu web2py',
-'Which called the function': 'Which called the function',
+'Which called the function': 'welche die Funktion aufrief',
 'Wrap with Abbreviation': 'mit Kürzel einhüllen',
 'xml': 'xml',
 'YES': 'JA',
--- a/applications/admin/languages/default.py
+++ b/applications/admin/languages/default.py
@@ -8,6 +8,7 @@
 '(something like "it-it")': '(something like "it-it")',
 'About': 'About',
 'Additional code for your application': 'Additional code for your application',
+'admin disabled because unable to access password file': 'admin disabled because unable to access password file',
 'Admin language': 'Admin language',
 'administrative interface': 'administrative interface',
 'Administrator Password:': 'Administrator Password:',
@@ -16,7 +17,11 @@
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
 'back': '<<back',
+'Basics': 'Basics',
+'Begin': 'Begin',
 'can be a git repo': 'can be a git repo',
 'Change admin password': 'Change admin password',
 'Check for upgrades': 'Check for upgrades',
@@ -33,9 +38,11 @@
 'created by': 'created by',
 'crontab': 'crontab',
 'currently running': 'currently running',
+'currently saved or': 'currently saved or',
 'database administration': 'database administration',
 'Debug': 'Debug',
 'defines tables': 'defines tables',
+'delete': 'delete',
 'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
 'Deploy': 'Deploy',
 'Deploy on Google App Engine': 'Deploy on Google App Engine',
@@ -43,39 +50,65 @@
 'Detailed traceback description': 'Detailed traceback description',
 'direction: ltr': 'direction: ltr',
 'Disable': 'Disable',
+'docs': 'docs',
 'download layouts': 'download layouts',
 'download plugins': 'download plugins',
 'Edit': 'Edit',
+'edit all': 'edit all',
 'Edit application': 'Edit application',
+'edit controller': 'edit controller',
+'edit views:': 'edit views:',
+'Editing file "%s"': 'Editing file "%s"',
+'Editing Language file': 'Editing Language file',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'Errors',
 'Exception instance attributes': 'Exception instance attributes',
+'Expand Abbreviation': 'Expand Abbreviation',
 'exposes': 'exposes',
+'exposes:': 'exposes:',
 'extends': 'extends',
+'failed to compile file because:': 'failed to compile file because:',
+'file does not exist': 'file does not exist',
+'file saved on %s': 'file saved on %s',
 'filter': 'filter',
 'Frames': 'Frames',
+'Generate': 'Generate',
 'Get from URL:': 'Get from URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
+'Go to Matching Pair': 'Go to Matching Pair',
+'go!': 'go!',
 'Help': 'Help',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
 'includes': 'includes',
 'inspect attributes': 'inspect attributes',
 'Install': 'Install',
 'Installed applications': 'Installed applications',
+'invalid password.': 'invalid password.',
+'Key bindings': 'Key bindings',
+'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
+'Language files (static strings) updated': 'Language files (static strings) updated',
 'languages': 'languages',
 'Languages': 'Languages',
+'Last saved on:': 'Last saved on:',
 'loading...': 'loading...',
 'locals': 'locals',
 'Login': 'Login',
 'Login to the Administrative Interface': 'Login to the Administrative Interface',
 'Logout': 'Logout',
-'Models': 'Models',
+'Match Pair': 'Match Pair',
+'Merge Lines': 'Merge Lines',
 'models': 'models',
-'modules': 'modules',
+'Models': 'Models',
 'Modules': 'Modules',
+'modules': 'modules',
+'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
 'New simple application': 'New simple application',
+'Next Edit Point': 'Next Edit Point',
+'online designer': 'online designer',
+'Original/Translation': 'Original/Translation',
 'Overwrite installed app': 'Overwrite installed app',
 'Pack all': 'Pack all',
 'Peeking at file': 'Peeking at file',
@@ -83,22 +116,36 @@
 'plugins': 'plugins',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Powered by',
+'Previous Edit Point': 'Previous Edit Point',
 'Private files': 'Private files',
 'private files': 'private files',
 'Reload routes': 'Reload routes',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'request': 'request',
 'response': 'response',
+'restart': 'restart',
+'restore': 'restore',
+'revert': 'revert',
 'rules are not defined': 'rules are not defined',
 'rules:': 'rules:',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
+'Save': 'Save',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Saved file hash:',
 'session': 'session',
+'session expired': 'session expired',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
 'Site': 'Site',
+'skip to generate': 'skip to generate',
+'Start a new app': 'Start a new app',
 'Start wizard': 'Start wizard',
 'static': 'static',
 'Static files': 'Static files',
+'Step': 'Step',
 'Submit': 'Submit',
+'successful': 'successful',
 'test': 'test',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
@@ -109,10 +156,15 @@
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
+'to  previous version.': 'to  previous version.',
 'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
 'Translation strings for the application': 'Translation strings for the application',
+'try view': 'try view',
 'Uninstall': 'Uninstall',
+'update': 'update',
 'update all languages': 'update all languages',
 'upload': 'upload',
 'Upload a package:': 'Upload a package:',
@@ -128,4 +180,5 @@
 'Web Framework': 'Web Framework',
 'web2py is up to date': 'web2py is up to date',
 'web2py Recent Tweets': 'web2py Recent Tweets',
+'Wrap with Abbreviation': 'Wrap with Abbreviation',
 }
--- a/applications/admin/languages/es.py
+++ b/applications/admin/languages/es.py
@@ -3,154 +3,29 @@
 '!langcode!': 'es',
 '!langname!': 'Español',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"actualice" es una expresión opcional como "campo1=\'nuevo_valor\'". No se puede actualizar o eliminar resultados de un JOIN',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '%s %%{row} deleted': '%s filas eliminadas',
 '%s %%{row} updated': '%s filas actualizadas',
+'%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")': '(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\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
 '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',
-'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!',
 'About': 'acerca de',
 'About application': 'Acerca de la aplicación',
-'Admin is disabled because insecure channel': 'Admin deshabilitado, el canal no es seguro',
-'Admin is disabled because unsecure channel': 'Admin deshabilitado, el canal no es seguro',
-'Administrator Password:': 'Contraseña del Administrador:',
-'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 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?',
-'Available databases and tables': 'Bases de datos y tablas disponibles',
-'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:',
-'Change Password': 'Cambie Contraseña',
-'Change admin password': 'cambie contraseña admin',
-'Check to delete': 'Marque para eliminar',
-'Checking for upgrades...': 'Buscando actulizaciones...',
-'Clean': 'limpiar',
-'Click row to expand traceback': 'Click row to expand traceback',
-'Client IP': 'IP del Cliente',
-'Compile': 'compilar',
-'Controllers': 'Controladores',
-'Count': 'Count',
-'Create': 'crear',
-'Create new application using the Wizard': 'Create new application using the Wizard',
-'Create new simple application': 'Cree una nueva aplicación',
-'Current request': 'Solicitud en curso',
-'Current response': 'Respuesta en curso',
-'Current session': 'Sesión en curso',
-'DESIGN': 'DISEÑO',
-'Date and Time': 'Fecha y Hora',
-'Delete': 'Elimine',
-'Delete:': 'Elimine:',
-'Deploy on Google App Engine': 'Instale en Google App Engine',
-'Description': 'Descripción',
-'Design for': 'Diseño para',
-'E-mail': 'Correo electrónico',
-'EDIT': 'EDITAR',
-'Edit': 'editar',
-'Edit Profile': 'Editar Perfil',
-'Edit application': 'Editar aplicación',
-'Edit current record': 'Edite el registro actual',
-'Editing Language file': 'Editando archivo de lenguaje',
-'Editing file': 'Editando archivo',
-'Editing file "%s"': 'Editando archivo "%s"',
-'Enterprise Web Framework': 'Armazón Empresarial para Internet',
-'Error': 'Error',
-'Error logs for "%(app)s"': 'Bitácora de errores en "%(app)s"',
-'Errors': 'errores',
-'Exception instance attributes': 'Atributos de la instancia de Excepción',
-'File': 'File',
-'First name': 'Nombre',
-'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
-'Group ID': 'ID de Grupo',
-'Hello World': 'Hola Mundo',
-'Help': 'ayuda',
-'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.',
-'Import/Export': 'Importar/Exportar',
-'Install': 'instalar',
-'Installed applications': 'Aplicaciones instaladas',
-'Internal State': 'Estado Interno',
-'Invalid Query': 'Consulta inválida',
-'Invalid action': 'Acción inválida',
-'Invalid email': 'Correo inválido',
-'Language files (static strings) updated': 'Archivos de lenguaje (cadenas estáticas) actualizados',
-'Languages': 'Lenguajes',
-'Last name': 'Apellido',
-'Last saved on:': 'Guardado en:',
-'License for': 'Licencia para',
-'Login': 'Inicio de sesión',
-'Login to the Administrative Interface': 'Inicio de sesión para la Interfaz Administrativa',
-'Logout': 'fin de sesión',
-'Lost Password': 'Contraseña perdida',
-'Models': 'Modelos',
-'Modules': 'Módulos',
-'NO': 'NO',
-'Name': 'Nombre',
-'New Record': 'Registro nuevo',
-'No databases in this application': 'No hay bases de datos en esta aplicación',
-'Origin': 'Origen',
-'Original/Translation': 'Original/Traducción',
-'Overwrite installed app': 'sobreescriba aplicación instalada',
-'PAM authenticated user, cannot change password here': 'usuario autenticado por PAM, no puede cambiar la contraseña aquí',
-'Pack all': 'empaquetar todo',
-'Pack compiled': 'empaquete compiladas',
-'Password': 'Contraseña',
-'Peeking at file': 'Visualizando archivo',
-'Plugin "%s" in application': 'Plugin "%s" en aplicación',
-'Plugins': 'Plugins',
-'Powered by': 'Este sitio usa',
-'Query:': 'Consulta:',
-'Record ID': 'ID de Registro',
-'Register': 'Registrese',
-'Registration key': 'Contraseña de Registro',
-'Remove compiled': 'eliminar compiladas',
-'Resolve Conflict file': 'archivo Resolución de Conflicto',
-'Role': 'Rol',
-'Rows in table': 'Filas en la tabla',
-'Rows selected': 'Filas seleccionadas',
-'Saved file hash:': 'Hash del archivo guardado:',
-'Site': 'sitio',
-'Static files': 'Archivos estáticos',
-'Sure you want to delete this object?': '¿Está seguro que desea eliminar este objeto?',
-'TM': 'MR',
-'Table name': 'Nombre de la tabla',
-'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.',
-'There are no controllers': 'No hay controladores',
-'There are no models': 'No hay modelos',
-'There are no modules': 'No hay módulos',
-'There are no 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',
-'This is the %(filename)s template': 'Esta es la plantilla %(filename)s',
-'Ticket': 'Tiquete',
-'Timestamp': 'Timestamp',
-'To create a plugin, name a file/folder plugin_[name]': 'Para crear un plugin, nombre un archivo/carpeta plugin_[nombre]',
-'Unable to check for upgrades': 'No es posible verificar la existencia de actualizaciones',
-'Unable to download': 'No es posible la descarga',
-'Unable to download app': 'No es posible descargar la aplicación',
-'Unable to download app because:': 'No es posible descargar la aplicación porque:',
-'Unable to download because': 'No es posible descargar porque',
-'Uninstall': 'desinstalar',
-'Update:': 'Actualice:',
-'Upload & install packed application': 'Suba e instale aplicación empaquetada',
-'Upload existing application': 'Suba esta aplicación',
-'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',
-'Version': 'Versión',
-'Views': 'Vistas',
-'Welcome to web2py': 'Bienvenido a web2py',
-'YES': 'SI',
 'additional code for your application': 'código adicional para su aplicación',
+'Additional code for your application': 'Additional code for your application',
 'admin disabled because no admin password': ' por falta de contraseña',
 'admin disabled because not supported on google app engine': 'admin deshabilitado, no es soportado en GAE',
 'admin disabled because unable to access password file': 'admin deshabilitado, imposible acceder al archivo con la contraseña',
+'Admin is disabled because insecure channel': 'Admin deshabilitado, el canal no es seguro',
+'Admin is disabled because unsecure channel': 'Admin deshabilitado, el canal no es seguro',
+'Admin language': 'Admin language',
+'administrative interface': 'administrative interface',
+'Administrator Password:': 'Contraseña del Administrador:',
+'An error occured, please %s the page': 'An error occured, please %s the page',
 'and rename it (required):': 'y renombrela (requerido):',
 'and rename it:': ' y renombrelo:',
 'appadmin': 'appadmin',
@@ -158,47 +33,136 @@
 'application "%s" uninstalled': 'aplicación "%s" desinstalada',
 'application compiled': 'aplicación compilada',
 'application is compiled and cannot be designed': 'la aplicación está compilada y no puede ser modificada',
+'Application name:': 'Application name:',
+'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 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?',
 'arguments': 'argumentos',
+'at char %s': 'at char %s',
+'at line %s': 'at line %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',
+'Autocomplete Python Code': 'Autocomplete Python Code',
+'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',
+'can be a git repo': 'can be a git repo',
+'Cannot be empty': 'No puede estar vacío',
+'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'No se puede compilar: hay errores en su aplicación. Depure, corrija errores y vuelva a intentarlo.',
+'Cannot compile: there are errors in your app:': 'No se puede compilar: hay errores en su aplicación:',
 'cannot create file': 'no es posible crear archivo',
 'cannot upload file "%(filename)s"': 'no es posible subir archivo "%(filename)s"',
+'Change admin password': 'cambie contraseña admin',
+'change editor settings': 'change editor settings',
+'Change Password': 'Cambie Contraseña',
 'check all': 'marcar todos',
+'Check for upgrades': 'Check for upgrades',
+'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',
 'click to check for upgrades': 'haga clic para buscar actualizaciones',
 'click to open': 'click to open',
+'Client IP': 'IP del Cliente',
 'code': 'código',
+'Code listing': 'Code listing',
+'collapse/expand all': 'collapse/expand all',
 'commit (mercurial)': 'commit (mercurial)',
+'Compile': 'compilar',
 'compiled application removed': 'aplicación compilada removida',
+'continue': 'continue',
+'Controllers': 'Controladores',
 'controllers': 'controladores',
+'Count': 'Count',
+'Create': 'crear',
 'create file with filename:': 'cree archivo con nombre:',
+'Create new application using the Wizard': 'Create new application using the Wizard',
 'create new application:': 'nombre de la nueva aplicación:',
+'Create new simple application': 'Cree una nueva aplicación',
 '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 saved or': 'actualmente guardado o',
 'customize me!': 'Adaptame!',
 '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',
+'Date and Time': 'Fecha y Hora',
 'db': 'db',
+'Debug': 'Debug',
 'defines tables': 'define tablas',
+'Delete': 'Elimine',
 'delete': 'eliminar',
 'delete all checked': 'eliminar marcados',
 'delete plugin': 'eliminar plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'Elimine:',
+'Deploy': 'Deploy',
+'Deploy on Google App Engine': 'Instale en Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
+'Description': 'Descripción',
 'design': 'modificar',
+'DESIGN': 'DISEÑO',
+'Design for': 'Diseño para',
+'Detailed traceback description': 'Detailed traceback description',
+'details': 'details',
 'direction: ltr': 'direction: ltr',
+'Disable': 'Disable',
+'docs': 'docs',
 'done!': 'listo!',
+'Download': 'Download',
+'download files via http:': 'download files via http:',
+'download layouts': 'download layouts',
+'download plugins': 'download plugins',
+'E-mail': 'Correo electrónico',
+'EDIT': 'EDITAR',
+'Edit': 'editar',
+'Edit application': 'Editar aplicación',
 'edit controller': 'editar controlador',
+'edit controller:': 'edit controller:',
+'Edit current record': 'Edite el registro actual',
+'Edit Profile': 'Editar Perfil',
 'edit views:': 'editar vistas:',
+'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',
+'Error': 'Error',
+'Error logs for "%(app)s"': 'Bitácora de errores en "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'errores',
+'Exception instance attributes': 'Atributos de la instancia de Excepción',
+'Expand Abbreviation': 'Expand Abbreviation',
 'export as csv file': 'exportar como archivo CSV',
 'exposes': 'expone',
+'exposes:': 'exposes:',
 'extends': 'extiende',
+'failed to compile file because:': 'failed to compile file because:',
 '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 "%(filename)s" created': 'archivo "%(filename)s" creado',
 'file "%(filename)s" deleted': 'archivo "%(filename)s" eliminado',
 'file "%(filename)s" uploaded': 'archivo "%(filename)s" subido',
@@ -208,76 +172,242 @@
 'file does not exist': 'archivo no existe',
 'file saved on %(time)s': 'archivo guardado %(time)s',
 'file saved on %s': 'archivo guardado %s',
+'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'First name': 'Nombre',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
+'Globals##debug': 'Globals',
+'graph model': 'graph model',
+'Group ID': 'ID de Grupo',
+'Hello World': 'Hola Mundo',
+'Help': 'ayuda',
 '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.',
+'Import/Export': 'Importar/Exportar',
 'includes': 'incluye',
 'insert new': 'inserte nuevo',
 'insert new %s': 'inserte nuevo %s',
+'inspect attributes': 'inspect attributes',
+'Install': 'instalar',
+'Installed applications': 'Aplicaciones instaladas',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'error interno',
+'Internal State': 'Estado Interno',
+'Invalid action': 'Acción inválida',
+'Invalid email': 'Correo inválido',
 'invalid password': 'contraseña inválida',
+'invalid password.': 'invalid password.',
+'Invalid Query': 'Consulta inválida',
 'invalid request': 'solicitud inválida',
 'invalid ticket': 'tiquete inválido',
+'Key bindings': 'Key bindings',
+'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
 'language file "%(filename)s" created/updated': 'archivo de lenguaje "%(filename)s" creado/actualizado',
+'Language files (static strings) updated': 'Archivos de lenguaje (cadenas estáticas) actualizados',
 'languages': 'lenguajes',
+'Languages': 'Lenguajes',
 'languages updated': 'lenguajes actualizados',
+'Last name': 'Apellido',
+'Last saved on:': 'Guardado en:',
+'License for': 'Licencia para',
 'loading...': 'cargando...',
+'locals': 'locals',
+'Locals##debug': 'Locals',
+'Login': 'Inicio de sesión',
 'login': 'inicio de sesión',
+'Login to the Administrative Interface': 'Inicio de sesión para la Interfaz Administrativa',
+'Logout': 'fin de sesión',
+'Lost Password': 'Contraseña perdida',
 'manage': 'manage',
+'Manage': 'Manage',
 'merge': 'combinar',
+'Models': 'Modelos',
 'models': 'modelos',
+'Modules': 'Módulos',
 'modules': 'módulos',
+'Name': 'Nombre',
 'new application "%s" created': 'nueva aplicación "%s" creada',
+'New application wizard': 'New application wizard',
 'new plugin installed': 'nuevo plugin instalado',
+'New Record': 'Registro nuevo',
 'new record inserted': 'nuevo registro insertado',
+'New simple application': 'New simple application',
+'next': 'next',
 '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 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',
+'Or Get from URL:': 'Or Get from 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',
+'Overwrite installed app': 'sobreescriba aplicación instalada',
+'Pack all': 'empaquetar todo',
+'Pack compiled': 'empaquete compiladas',
+'Pack custom': 'Pack custom',
 'pack plugin': 'empaquetar plugin',
+'PAM authenticated user, cannot change password here': 'usuario autenticado por PAM, no puede cambiar la contraseña aquí',
+'Password': 'Contraseña',
 'password changed': 'contraseña cambiada',
+'Peeking at file': 'Visualizando archivo',
+'Please': 'Please',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" eliminado',
+'Plugin "%s" in application': 'Plugin "%s" en aplicación',
+'plugins': 'plugins',
+'Plugins': 'Plugins',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Este sitio usa',
 'previous 100 rows': '100 filas anteriores',
+'Private files': 'Private files',
+'private files': 'private files',
+'Query:': 'Consulta:',
+'Rapid Search': 'Rapid Search',
 'record': 'registro',
 'record does not exist': 'el registro no existe',
 'record id': 'id de registro',
+'Record ID': 'ID de Registro',
+'refresh': 'refresh',
+'Register': 'Registrese',
+'Registration key': 'Contraseña de Registro',
+'reload': 'reload',
+'Reload routes': 'Reload routes',
+'Remove compiled': 'eliminar compiladas',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'request': 'request',
+'Resolve Conflict file': 'archivo Resolución de Conflicto',
+'response': 'response',
 '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',
 'save': 'guardar',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Hash del archivo guardado:',
 'selected': 'seleccionado(s)',
+'session': 'session',
 'session expired': 'sesión expirada',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
+'Site': 'sitio',
 'some files could not be removed': 'algunos archivos no pudieron ser removidos',
+'Start searching': 'Start searching',
+'Start wizard': 'Start wizard',
 'state': 'estado',
+'Static': 'Static',
 'static': 'estáticos',
+'Static files': 'Archivos estáticos',
+'step': 'step',
+'stop': 'stop',
 'submit': 'enviar',
+'Submit': 'Submit',
+'successful': 'successful',
+'Sure you want to delete this object?': '¿Está seguro que desea eliminar este objeto?',
 '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': 'The application logic, each URL path is mapped in one exposed function in the controller',
 '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': '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': 'la capa de presentación, las vistas también son llamadas plantillas',
+'There are no controllers': 'No hay controladores',
+'There are no models': 'No hay modelos',
+'There are no modules': 'No hay módulos',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'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': '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': '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',
+'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!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
 'translation strings for the application': 'cadenas de caracteres de traducción para la aplicación',
+'Translation strings for the application': 'Translation strings for the application',
 'try': 'intente',
 'try something like': 'intente algo como',
+'Try the mobile interface': 'Try the mobile interface',
+'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.',
+'Unable to check for upgrades': 'No es posible verificar la existencia de actualizaciones',
 'unable to create application "%s"': 'no es posible crear la aplicación "%s"',
 'unable to delete file "%(filename)s"': 'no es posible eliminar el archivo "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'no es posible eliminar plugin "%(plugin)s"',
+'Unable to download': 'No es posible la descarga',
+'Unable to download app': 'No es posible descargar la aplicación',
+'Unable to download app because:': 'No es posible descargar la aplicación porque:',
+'Unable to download because': 'No es posible descargar porque',
 'unable to parse csv file': 'no es posible analizar el archivo CSV',
 'unable to uninstall "%s"': 'no es posible instalar "%s"',
 'unable to upgrade because "%s"': 'no es posible actualizar porque "%s"',
 'uncheck all': 'desmarcar todos',
+'Uninstall': 'desinstalar',
 'update': 'actualizar',
 'update all languages': 'actualizar todos los lenguajes',
+'Update:': 'Actualice:',
+'upgrade now to %s': 'upgrade now to %s',
 'upgrade web2py now': 'actualize web2py ahora',
+'Upload': 'Upload',
+'Upload & install packed application': 'Suba e instale aplicación empaquetada',
+'Upload a package:': 'Upload a package:',
+'Upload and install packed application': 'Upload and install packed application',
 'upload application:': 'subir aplicación:',
+'Upload existing application': 'Suba esta aplicación',
 'upload file:': 'suba archivo:',
 'upload plugin file:': 'suba 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',
 'view': 'vista',
+'Views': 'Vistas',
 'views': 'vistas',
-'web2py Recent Tweets': 'Tweets Recientes de web2py',
+'Web Framework': 'Web Framework',
 'web2py is up to date': 'web2py está actualizado',
+'web2py online debugger': 'web2py online debugger',
+'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',
 }
--- a/applications/admin/languages/fr.py
+++ b/applications/admin/languages/fr.py
@@ -5,11 +5,11 @@
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" est une expression en option tels que "field1 = \'newvalue\'". Vous ne pouvez pas mettre à jour ou supprimer les résultats d\'une jointure "a JOIN"',
 '%Y-%m-%d': '%d-%m-%Y',
 '%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
-'%s %%{row} deleted': 'lignes %s supprimé',
-'%s %%{row} updated': 'lignes %s mis à jour',
-'(requires internet access)': '(requires internet access)',
+'%s %%{row} deleted': 'lignes %s supprimées',
+'%s %%{row} updated': 'lignes %s mises à jour',
+'(requires internet access)': '(nécessite un accès Internet)',
 '(something like "it-it")': '(quelque chose comme "it-it") ',
-'@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01Searching: **%s** %%{file}': 'Cherche: **%s** fichiers',
 'A new version of web2py is available: %s': 'Une nouvelle version de web2py est disponible: %s ',
 'A new version of web2py is available: Version 1.68.2 (2009-10-21 09:59:29)\n': 'Une nouvelle version de web2py est disponible: Version 1.68.2 (2009-10-21 09:59:29)\r\n',
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: nécessite une connexion sécurisée (HTTPS) ou être en localhost. ',
@@ -17,59 +17,59 @@
 'ATTENTION: you cannot edit the running application!': "ATTENTION: vous ne pouvez pas modifier l'application qui tourne!",
 'About': 'à propos',
 'About application': "A propos de l'application",
-'Additional code for your application': 'Additional code for your application',
+'Additional code for your application': 'Code additionnel pour votre application',
 'Admin is disabled because insecure channel': 'Admin est désactivé parce que canal non sécurisé',
-'Admin language': 'Admin language',
+'Admin language': "Language de l'admin",
 'Administrator Password:': 'Mot de passe Administrateur:',
-'Application name:': 'Application name:',
-'Are you sure you want to delete file "%s"?': 'Etes-vous sûr de vouloir supprimer le fichier «%s»?',
-'Are you sure you want to delete plugin "%s"?': 'Etes-vous sûr de vouloir effacer le plugin "%s"?',
-'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Application name:': "Nom de l'application:",
+'Are you sure you want to delete file "%s"?': 'Êtes-vous sûr de vouloir supprimer le fichier «%s»?',
+'Are you sure you want to delete plugin "%s"?': 'Êtes-vous sûr de vouloir supprimer le plugin "%s"?',
+'Are you sure you want to delete this object?': 'Êtes-vous sûr de vouloir supprimer cet objet?',
 'Are you sure you want to uninstall application "%s"?': "Êtes-vous sûr de vouloir désinstaller l'application «%s»?",
-'Are you sure you want to upgrade web2py now?': 'Are you sure you want to upgrade web2py now?',
+'Are you sure you want to upgrade web2py now?': 'Êtes-vous sûr de vouloir mettre à jour web2py maintenant?',
 'Available databases and tables': 'Bases de données et tables disponible',
 'Cannot be empty': 'Ne peut pas être vide',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Ne peut pas compiler: il y a des erreurs dans votre application. corriger les erreurs et essayez à nouveau.',
-'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
-'Change admin password': 'change admin password',
-'Check for upgrades': 'check for upgrades',
+'Cannot compile: there are errors in your app:': 'Ne peut pas compiler: il y a des erreurs dans votre application:',
+'Change admin password': 'Changer le mot de passe admin',
+'Check for upgrades': 'Vérifier les mises à jour',
 'Check to delete': 'Cocher pour supprimer',
 'Checking for upgrades...': 'Vérification des mises à jour ... ',
 'Clean': 'nettoyer',
 'Compile': 'compiler',
 'Controllers': 'Contrôleurs',
-'Create': 'create',
+'Create': 'Créer',
 'Create new simple application': 'Créer une nouvelle application',
-'Current request': 'Requête actuel',
+'Current request': 'Requête actuelle',
 'Current response': 'Réponse actuelle',
 'Current session': 'Session en cours',
 'Date and Time': 'Date et heure',
 'Delete': 'Supprimer',
-'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete this file (you will be asked to confirm deletion)': 'Supprimer ce fichier (on vous demandera de confirmer la suppression)',
 'Delete:': 'Supprimer:',
-'Deploy': 'deploy',
+'Deploy': 'Déployer',
 'Deploy on Google App Engine': 'Déployer sur Google App Engine',
 'EDIT': 'MODIFIER',
 'Edit': 'modifier',
 'Edit application': "Modifier l'application",
-'Edit current record': 'Modifier cet entrée',
+'Edit current record': 'Modifier cette entrée',
 'Editing Language file': 'Modifier le fichier de langue',
 'Editing file': 'Modifier le fichier',
 'Editing file "%s"': 'Modifier le fichier "% s" ',
 'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error logs for "%(app)s"': 'Journal d\'erreurs pour "%(app)s"',
 'Errors': 'erreurs',
-'Exception instance attributes': 'Exception instance attributes',
-'Functions with no doctests will result in [passed] tests.': 'Des fonctions sans doctests entraînera tests [passed] .',
+'Exception instance attributes': "Attributs d'instance Exception",
+'Functions with no doctests will result in [passed] tests.': 'Des fonctions sans doctests entraîneront des tests [passed] .',
 'Help': 'aide',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': "Si le rapport ci-dessus contient un numéro de ticket, cela indique une défaillance dans l'exécution du contrôleur, avant toute tentative d'exécuter les doctests. Cela est généralement dû à une erreur d'indentation ou une erreur à l'extérieur du code de la fonction.\r\nUn titre verte indique que tous les tests (si définie) passed. Dans ce cas, les résultats des essais ne sont pas affichées.",
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': "Si le rapport ci-dessus contient un numéro de ticket, cela indique une défaillance dans l'exécution du contrôleur, avant toute tentative d'exécuter les doctests. Cela est généralement dû à une erreur d'indentation ou une erreur à l'extérieur du code de la fonction.\r\nUn titre vert indique que tous les tests (si définis) sont passés. Dans ce cas, les résultats des essais ne sont pas affichées.",
 'Import/Export': 'Importer/Exporter',
-'Install': 'install',
-'Installed applications': 'Les applications installées',
+'Install': 'Installer',
+'Installed applications': 'Applications installées',
 'Internal State': 'État Interne',
 'Invalid Query': 'Requête non valide',
 'Invalid action': 'Action non valide',
-'Language files (static strings) updated': 'Fichiers de langue (static strings) Mise à jour ',
+'Language files (static strings) updated': 'Fichiers de langue (chaînes statiques) mis à jour ',
 'Languages': 'Langues',
 'Last saved on:': 'Dernière sauvegarde le:',
 'License for': 'Licence pour',
@@ -79,13 +79,13 @@
 'Models': 'Modèles',
 'Modules': 'Modules',
 'NO': 'NON',
-'New Record': 'Nouvel Entrée',
-'New application wizard': 'New application wizard',
-'New simple application': 'New simple application',
+'New Record': 'Nouvelle Entrée',
+'New application wizard': 'Assistant nouvelle application',
+'New simple application': 'Nouvelle application simple',
 'No databases in this application': 'Aucune base de données dans cette application',
 'Original/Translation': 'Original / Traduction',
-'Overwrite installed app': 'overwrite installed app',
-'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
+'Overwrite installed app': "Écraser l'application installée",
+'PAM authenticated user, cannot change password here': 'Utilisateur authentifié par PAM, vous ne pouvez pas changer le mot de passe ici',
 'Pack all': 'tout empaqueter',
 'Pack compiled': 'paquet compilé',
 'Peeking at file': 'Jeter un oeil au fichier',
@@ -97,101 +97,101 @@
 'Resolve Conflict file': 'Résoudre les conflits de fichiers',
 'Rows in table': 'Lignes de la table',
 'Rows selected': 'Lignes sélectionnées',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
-'Save': 'Save',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Lancer les tests dans ce fichier (pour lancer tous les fichiers, vous pouvez également utiliser le bouton nommé 'test')",
+'Save': 'Enregistrer',
 'Saved file hash:': 'Hash du Fichier enregistré:',
-'Site': 'site',
-'Start wizard': 'start wizard',
+'Site': 'Site',
+'Start wizard': "Démarrer l'assistant",
 'Static files': 'Fichiers statiques',
 'Sure you want to delete this object?': 'Vous êtes sûr de vouloir supprimer cet objet? ',
 'TM': 'MD',
 'Testing application': "Test de l'application",
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La "requête" est une condition comme "db.table1.field1==\'value\'". Quelque chose comme "db.table1.field1==db.table2.field2" aboutit à un JOIN SQL.',
-'The application logic, each URL path is mapped in one exposed function in the controller': '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': "Il n'existe pas de contrôleurs",
-'There are no models': "Il n'existe pas de modèles",
-'There are no modules': "Il n'existe pas de modules",
-'There are no plugins': 'There are no plugins',
-'There are no static files': "Il n'existe pas de fichiers statiques",
-'There are no translators, only default language is supported': "Il n'y a pas de traducteurs, est prise en charge uniquement la langue par défaut",
-'There are no views': "Il n'existe pas de vues",
-'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
+'The application logic, each URL path is mapped in one exposed function in the controller': "La logique de l'application, chaque chemin d'URL est mappé avec une fonction exposée dans le contrôleur",
+'The data representation, define database tables and sets': 'La représentation des données, définir les tables et ensembles de la base de données',
+'The presentations layer, views are also known as templates': "Les couches de présentation, les vues sont également appelées modples",
+'There are no controllers': "Il n'y a pas de contrôleurs",
+'There are no models': "Il n'y a pas de modèles",
+'There are no modules': "Il n'y a pas de modules",
+'There are no plugins': "Il n'y a pas de plugins",
+'There are no static files': "Il n'y a pas de fichiers statiques",
+'There are no translators, only default language is supported': "Il n'y a pas de traducteurs, seule la langue par défaut est prise en charge",
+'There are no views': "Il n'y a pas de vues",
+'These files are served without processing, your images go here': 'Ces fichiers sont renvoyés sans traitement, vos images viennent ici',
 'This is the %(filename)s template': 'Ceci est le modèle %(filename)s ',
 'Ticket': 'Ticket',
 'To create a plugin, name a file/folder plugin_[name]': 'Pour créer un plugin, créer un fichier /dossier plugin_[nom]',
-'Translation strings for the application': 'Translation strings for the application',
-'Unable to check for upgrades': 'Impossible de vérifier les mises à niveau',
+'Translation strings for the application': "Chaînes de traduction pour l'application",
+'Unable to check for upgrades': 'Impossible de vérifier les mises à jour',
 'Unable to download': 'Impossible de télécharger',
-'Unable to download app': 'Impossible de télécharger app',
-'Unable to download app because:': 'Unable to download app because:',
-'Unable to download because': 'Unable to download because',
+'Unable to download app': "Impossible de télécharger l'app",
+'Unable to download app because:': "Impossible de télécharger l'app car:",
+'Unable to download because': 'Impossible de télécharger car',
 'Uninstall': 'désinstaller',
 'Update:': 'Mise à jour:',
-'Upload & install packed application': 'Upload & install packed application',
-'Upload a package:': 'Upload a package:',
-'Upload existing application': 'charger une application existante',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Utilisez (...)&(...) pour AND, (...)|(...) pour OR, et ~(...) pour NOT et construire des requêtes plus complexes. ',
-'Use an url:': 'Use an url:',
+'Upload & install packed application': "Charger & installer l'application empaquetée",
+'Upload a package:': 'Charger un paquet:',
+'Upload existing application': 'Charger une application existante',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Utilisez (...)&(...) pour AND, (...)|(...) pour OR, et ~(...) pour NOT afin de construire des requêtes plus complexes. ',
+'Use an url:': 'Utiliser une url:',
 'Version': 'Version',
 'Views': 'Vues',
-'Web Framework': 'Web Framework',
+'Web Framework': 'Framework Web',
 'YES': 'OUI',
 'additional code for your application': 'code supplémentaire pour votre application',
-'admin disabled because no admin password': 'admin désactivé car aucun mot de passe admin',
-'admin disabled because not supported on google app engine': 'admin désactivé car non pris en charge sur Google Apps engine',
-'admin disabled because unable to access password file': "admin désactivé car incapable d'accéder au fichier mot de passe",
-'administrative interface': 'administrative interface',
+'admin disabled because no admin password': 'admin désactivée car aucun mot de passe admin',
+'admin disabled because not supported on google app engine': 'admin désactivée car non prise en charge sur Google Apps engine',
+'admin disabled because unable to access password file': "admin désactivée car incapable d'accéder au fichier mot de passe",
+'administrative interface': "interface d'administration",
 'and rename it (required):': 'et renommez-la (obligatoire):',
 'and rename it:': 'et renommez-le:',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'appadmin est désactivé parce que canal non sécurisé',
-'application "%s" uninstalled': 'application "%s" désinstallé',
-'application %(appname)s installed with md5sum: %(digest)s': 'application %(appname)s installed with md5sum: %(digest)s',
+'application "%s" uninstalled': 'application "%s" désinstallée',
+'application %(appname)s installed with md5sum: %(digest)s': 'application %(appname)s installée avec md5sum: %(digest)s',
 'application compiled': 'application compilée',
-'application is compiled and cannot be designed': "l'application est compilée et ne peut être désigné",
+'application is compiled and cannot be designed': "l'application est compilée et ne peut être modifiée",
 'arguments': 'arguments',
 'back': 'retour',
 'cache': 'cache',
-'cache, errors and sessions cleaned': 'cache, erreurs et sessions nettoyé',
-'cannot create file': 'ne peu pas créer de fichier',
-'cannot upload file "%(filename)s"': 'ne peu pas charger le fichier "%(filename)s"',
-'check all': 'tous vérifier ',
-'click to check for upgrades': 'Cliquez pour vérifier les mises à niveau',
+'cache, errors and sessions cleaned': 'cache, erreurs et sessions nettoyés',
+'cannot create file': 'ne peut pas créer de fichier',
+'cannot upload file "%(filename)s"': 'ne peut pas charger le fichier "%(filename)s"',
+'check all': 'tout vérifier ',
+'click to check for upgrades': 'Cliquez pour vérifier les mises jour',
 'code': 'code',
-'collapse/expand all': 'collapse/expand all',
-'compiled application removed': 'application compilée enlevé',
+'collapse/expand all': 'tout réduire/agrandir',
+'compiled application removed': 'application compilée enlevée',
 'controllers': 'contrôleurs',
 'create file with filename:': 'créer un fichier avec nom de fichier:',
 'create new application:': 'créer une nouvelle application:',
 'created by': 'créé par',
 'crontab': 'crontab',
-'currently running': 'currently running',
-'currently saved or': 'actuellement enregistrés ou',
+'currently running': 'tourne actuellement',
+'currently saved or': 'actuellement enregistré ou',
 'data uploaded': 'données chargées',
 'database': 'base de données',
 'database %s select': 'base de données  %s sélectionner',
 'database administration': 'administration base de données',
-'db': 'db',
+'db': 'bdd',
 'defines tables': 'définit les tables',
 'delete': 'supprimer',
-'delete all checked': 'supprimer tout ce qui est cocher',
-'delete plugin': ' supprimer plugin',
+'delete all checked': 'supprimer tout ce qui est coché',
+'delete plugin': ' supprimer le plugin',
 'design': 'conception',
 'direction: ltr': 'direction: ltr',
 'docs': 'docs',
 'done!': 'fait!',
-'download layouts': 'download layouts',
-'download plugins': 'download plugins',
+'download layouts': 'télécharger layouts',
+'download plugins': 'télécharger plugins',
 'edit controller': 'modifier contrôleur',
-'edit views:': 'edit views:',
-'export as csv file': 'exportation au format CSV',
+'edit views:': 'modifier vues:',
+'export as csv file': 'export au format CSV',
 'exposes': 'expose',
-'exposes:': 'exposes:',
+'exposes:': 'expose:',
 'extends': 'étend',
 'failed to reload module': 'impossible de recharger le module',
-'failed to reload module because:': 'failed to reload module because:',
+'failed to reload module because:': 'impossible de recharger le module car:',
 'file "%(filename)s" created': 'fichier "%(filename)s" créé',
 'file "%(filename)s" deleted': 'fichier "%(filename)s" supprimé',
 'file "%(filename)s" uploaded': 'fichier "%(filename)s" chargé',
@@ -200,7 +200,7 @@
 'file does not exist': "fichier n'existe pas",
 'file saved on %(time)s': 'fichier enregistré le %(time)s',
 'file saved on %s': 'fichier enregistré le %s',
-'filter': 'filter',
+'filter': 'filtre',
 'htmledit': 'edition html',
 'includes': 'inclus',
 'index': 'index',
@@ -219,14 +219,14 @@
 'modules': 'modules',
 'new application "%s" created': 'nouvelle application "%s" créée',
 'new plugin installed': 'nouveau plugin installé',
-'new record inserted': 'nouvelle entrée inséré',
+'new record inserted': 'nouvelle entrée insérée',
 'next 100 rows': '100 lignes suivantes',
-'no match': 'no match',
+'no match': 'aucune correspondance',
 'or import from csv file': 'ou importer depuis un fichier CSV ',
-'or provide app url:': 'or provide app url:',
+'or provide app url:': "ou fournir l'URL de l'app:",
 'or provide application url:': "ou fournir l'URL de l'application:",
 'pack plugin': 'paquet plugin',
-'password changed': 'password changed',
+'password changed': 'mot de passe modifié',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" supprimé',
 'plugins': 'plugins',
 'previous 100 rows': '100 lignes précédentes',
@@ -245,9 +245,9 @@
 'submit': 'envoyer',
 'table': 'table',
 'test': 'tester',
-'the application logic, each URL path is mapped in one exposed function in the controller': "la logique de l'application, chaque route URL est mappé dans une fonction exposée dans le contrôleur",
-'the data representation, define database tables and sets': 'la représentation des données, défini les tables de bases de données et sets',
-'the presentations layer, views are also known as templates': 'la couche des présentations, les vues sont également connus en tant que modèles',
+'the application logic, each URL path is mapped in one exposed function in the controller': "la logique de l'application, chaque chemin d'URL est mappé dans une fonction exposée dans le contrôleur",
+'the data representation, define database tables and sets': 'La représentation des données, définir les tables et ensembles de la base de données',
+'the presentations layer, views are also known as templates': 'la couche de présentation, les vues sont également appelées modèles',
 'these files are served without processing, your images go here': 'ces fichiers sont servis sans transformation, vos images vont ici',
 'to  previous version.': 'à la version précédente.',
 'translation strings for the application': "chaînes de traduction de l'application",
@@ -258,22 +258,22 @@
 'unable to delete file plugin "%(plugin)s"': 'impossible de supprimer le plugin "%(plugin)s"',
 'unable to parse csv file': "impossible d'analyser les fichiers CSV",
 'unable to uninstall "%s"': 'impossible de désinstaller "%s"',
-'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
+'unable to upgrade because "%s"': 'impossible de mettre à jour car "%s"',
 'uncheck all': 'tout décocher',
 'update': 'mettre à jour',
 'update all languages': 'mettre à jour toutes les langues',
-'upgrade now': 'upgrade now',
-'upgrade web2py now': 'upgrade web2py now',
-'upload': 'upload',
+'upgrade now': 'mettre à jour maintenant',
+'upgrade web2py now': 'mettre à jour web2py maintenant',
+'upload': 'charger',
 'upload application:': "charger l'application:",
 'upload file:': 'charger le fichier:',
 'upload plugin file:': 'charger fichier plugin:',
-'user': 'user',
+'user': 'utilisateur',
 'variables': 'variables',
 'versioning': 'versioning',
 'view': 'vue',
 'views': 'vues',
-'web2py Recent Tweets': 'web2py Tweets récentes',
+'web2py Recent Tweets': 'Tweets récents sur web2py ',
 'web2py is up to date': 'web2py est à jour',
-'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'web2py upgraded; please restart it': 'web2py mis à jour; veuillez le redémarrer',
 }
--- a/applications/admin/languages/it.py
+++ b/applications/admin/languages/it.py
@@ -3,143 +3,29 @@
 '!langcode!': 'it',
 '!langname!': 'Italiano',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" è un\'espressione opzionale come "campo1=\'nuovo valore\'". Non si può fare "update" o "delete" dei risultati di un JOIN ',
-'%Y-%m-%d': '%d/%m/%Y',
-'%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
 '%s %%{row} deleted': '%s righe ("record") cancellate',
 '%s %%{row} updated': '%s righe ("record") modificate',
+'%Y-%m-%d': '%d/%m/%Y',
+'%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
 '(requires internet access)': '(requires internet access)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(qualcosa simile a "it-it")',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
 'A new version of web2py is available: %s': 'È disponibile una nuova versione di web2py: %s',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': "ATTENZIONE: L'accesso richiede una connessione sicura (HTTPS) o l'esecuzione di web2py in locale (connessione su localhost)",
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTZIONE: NON ESEGUIRE PIÙ TEST IN PARALLELO (I TEST NON SONO "THREAD SAFE")',
-'ATTENTION: you cannot edit the running application!': "ATTENZIONE: non puoi modificare l'applicazione correntemente in uso ",
 'About': 'informazioni',
 'About application': "Informazioni sull'applicazione",
-'Admin is disabled because insecure channel': 'amministrazione disabilitata: comunicazione non sicura',
-'Admin language': 'Admin language',
-'Administrator Password:': 'Password Amministratore:',
-'Application name:': 'Application name:',
-'Are you sure you want to delete file "%s"?': 'Confermi di voler cancellare il file "%s"?',
-'Are you sure you want to delete plugin "%s"?': 'Confermi di voler cancellare il plugin "%s"?',
-'Are you sure you want to uninstall application "%s"?': 'Confermi di voler disinstallare l\'applicazione "%s"?',
-'Are you sure you want to upgrade web2py now?': 'Confermi di voler aggiornare web2py ora?',
-'Available databases and tables': 'Database e tabelle disponibili',
-'Cannot be empty': 'Non può essere vuoto',
-'Cannot compile: there are errors in your app:': "Compilazione fallita: ci sono errori nell'applicazione.",
-'Change admin password': 'change admin password',
-'Check for upgrades': 'check for upgrades',
-'Check to delete': 'Seleziona per cancellare',
-'Checking for upgrades...': 'Controllo aggiornamenti in corso...',
-'Clean': 'pulisci',
-'Compile': 'compila',
-'Controller': 'Controller',
-'Controllers': 'Controllers',
-'Copyright': 'Copyright',
-'Create': 'crea',
-'Create new simple application': 'Crea nuova applicazione',
-'Current request': 'Richiesta (request) corrente',
-'Current response': 'Risposta (response) corrente',
-'Current session': 'Sessione (session) corrente',
-'DB Model': 'Modello di DB',
-'Database': 'Database',
-'Date and Time': 'Data and Ora',
-'Delete': 'Cancella',
-'Delete:': 'Cancella:',
-'Deploy': 'deploy',
-'Deploy on Google App Engine': 'Installa su Google App Engine',
-'EDIT': 'MODIFICA',
-'Edit': 'modifica',
-'Edit This App': 'Modifica questa applicazione',
-'Edit application': 'Modifica applicazione',
-'Edit current record': 'Modifica record corrente',
-'Editing Language file': 'Modifica file linguaggio',
-'Editing file "%s"': 'Modifica del file "%s"',
-'Enterprise Web Framework': 'Enterprise Web Framework',
-'Error logs for "%(app)s"': 'Log degli errori per "%(app)s"',
-'Errors': 'errori',
-'Exception instance attributes': 'Exception instance attributes',
-'Functions with no doctests will result in [passed] tests.': 'I test delle funzioni senza "doctests" risulteranno sempre [passed].',
-'Hello World': 'Salve Mondo',
-'Help': 'aiuto',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
-'Import/Export': 'Importa/Esporta',
-'Index': 'Indice',
-'Install': 'installa',
-'Installed applications': 'Applicazioni installate',
-'Internal State': 'Stato interno',
-'Invalid Query': 'Richiesta (query) non valida',
-'Invalid action': 'Azione non valida',
-'Language files (static strings) updated': 'Linguaggi (documenti con stringhe statiche) aggiornati',
-'Languages': 'Linguaggi',
-'Last saved on:': 'Ultimo salvataggio:',
-'Layout': 'Layout',
-'License for': 'Licenza relativa a',
-'Login': 'Accesso',
-'Login to the Administrative Interface': "Accesso all'interfaccia amministrativa",
-'Logout': 'uscita',
-'Main Menu': 'Menu principale',
-'Menu Model': 'Menu Modelli',
-'Models': 'Modelli',
-'Modules': 'Moduli',
-'NO': 'NO',
-'New Record': 'Nuovo elemento (record)',
-'New application wizard': 'New application wizard',
-'New simple application': 'New simple application',
-'No databases in this application': 'Nessun database presente in questa applicazione',
-'Original/Translation': 'Originale/Traduzione',
-'Overwrite installed app': 'sovrascrivi applicazione installata',
-'PAM authenticated user, cannot change password here': 'utente autenticato tramite PAM, impossibile modificare password qui',
-'Pack all': 'crea pacchetto',
-'Pack compiled': 'crea pacchetto del codice compilato',
-'Peeking at file': 'Uno sguardo al file',
-'Plugin "%s" in application': 'Plugin "%s" nell\'applicazione',
-'Plugins': 'I Plugins',
-'Powered by': 'Powered by',
-'Query:': 'Richiesta (query):',
-'Remove compiled': 'rimozione codice compilato',
-'Resolve Conflict file': 'File di risoluzione conflitto',
-'Rows in table': 'Righe nella tabella',
-'Rows selected': 'Righe selezionate',
-'Saved file hash:': 'Hash del file salvato:',
-'Site': 'sito',
-'Start wizard': 'start wizard',
-'Static files': 'Files statici',
-'Stylesheet': 'Foglio di stile (stylesheet)',
-'Sure you want to delete this object?': 'Vuoi veramente cancellare questo oggetto?',
-'TM': 'TM',
-'Testing application': 'Test applicazione in corsg',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La richiesta (query) è una condizione come ad esempio  "db.tabella1.campo1==\'valore\'". Una condizione come "db.tabella1.campo1==db.tabella2.campo2" produce un "JOIN" SQL.',
-'There are no controllers': 'Non ci sono controller',
-'There are no models': 'Non ci sono modelli',
-'There are no modules': 'Non ci sono moduli',
-'There are no static files': 'Non ci sono file statici',
-'There are no translators, only default language is supported': 'Non ci sono traduzioni, viene solo supportato il linguaggio di base',
-'There are no views': 'Non ci sono viste ("view")',
-'This is the %(filename)s template': 'Questo è il template %(filename)s',
-'Ticket': 'Ticket',
-'To create a plugin, name a file/folder plugin_[name]': 'Per creare un plugin, chiamare un file o cartella plugin_[nome]',
-'Unable to check for upgrades': 'Impossibile controllare presenza di aggiornamenti',
-'Unable to download app because:': 'Impossibile scaricare applicazione perché',
-'Unable to download because': 'Impossibile scaricare perché',
-'Unable to download because:': 'Unable to download because:',
-'Uninstall': 'disinstalla',
-'Update:': 'Aggiorna:',
-'Upload & install packed application': 'Carica ed installa pacchetto con applicazione',
-'Upload a package:': 'Upload a package:',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Per costruire richieste (query) più complesse si usano (...)&(...) come "e" (AND), (...)|(...) come "o" (OR), e ~(...) come negazione (NOT).',
-'Use an url:': 'Use an url:',
-'Version': 'Versione',
-'View': 'Vista',
-'Views': 'viste',
-'Welcome %s': 'Benvenuto %s',
-'Welcome to web2py': 'Benvenuto su web2py',
-'YES': 'SI',
 'additional code for your application': 'righe di codice aggiuntive per la tua applicazione',
+'Additional code for your application': 'Additional code for your application',
 'admin disabled because no admin password': 'amministrazione disabilitata per mancanza di password amministrativa',
 'admin disabled because not supported on google app engine': 'amministrazione non supportata da Google Apps Engine',
 'admin disabled because unable to access password file': 'amministrazione disabilitata per impossibilità di leggere il file delle password',
+'Admin is disabled because insecure channel': 'amministrazione disabilitata: comunicazione non sicura',
+'Admin language': 'Admin language',
 'administrative interface': 'administrative interface',
+'Administrator Password:': 'Password Amministratore:',
+'An error occured, please %s the page': 'An error occured, please %s the page',
 'and rename it (required):': 'e rinominala (obbligatorio):',
 'and rename it:': 'e rinominala:',
 'appadmin': 'appadmin ',
@@ -147,44 +33,108 @@
 'application "%s" uninstalled': 'applicazione "%s" disinstallata',
 'application compiled': 'applicazione compilata',
 'application is compiled and cannot be designed': "l'applicazione è compilata e non si può modificare",
+'Application name:': 'Application name:',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
+'Are you sure you want to delete file "%s"?': 'Confermi di voler cancellare il file "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Confermi di voler cancellare il 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"?': 'Confermi di voler disinstallare l\'applicazione "%s"?',
+'Are you sure you want to upgrade web2py now?': 'Confermi di voler aggiornare web2py ora?',
 'arguments': 'arguments',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': "ATTENZIONE: L'accesso richiede una connessione sicura (HTTPS) o l'esecuzione di web2py in locale (connessione su localhost)",
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTZIONE: NON ESEGUIRE PIÙ TEST IN PARALLELO (I TEST NON SONO "THREAD SAFE")',
+'ATTENTION: you cannot edit the running application!': "ATTENZIONE: non puoi modificare l'applicazione correntemente in uso ",
+'Autocomplete Python Code': 'Autocomplete Python Code',
+'Available databases and tables': 'Database e tabelle disponibili',
 'back': 'indietro',
 'cache': 'cache',
 'cache, errors and sessions cleaned': 'pulitura cache, errori and sessioni ',
+'can be a git repo': 'can be a git repo',
+'Cannot be empty': 'Non può essere vuoto',
+'Cannot compile: there are errors in your app:': "Compilazione fallita: ci sono errori nell'applicazione.",
 'cannot create file': 'impossibile creare il file',
 'cannot upload file "%(filename)s"': 'impossibile caricare il file "%(filename)s"',
+'Change admin password': 'change admin password',
+'change editor settings': 'change editor settings',
 'change password': 'cambia password',
 'check all': 'controlla tutto',
+'Check for upgrades': 'check for upgrades',
+'Check to delete': 'Seleziona per cancellare',
+'Checking for upgrades...': 'Controllo aggiornamenti in corso...',
+'Clean': 'pulisci',
 'click here for online examples': 'clicca per vedere gli esempi',
 'click here for the administrative interface': "clicca per l'interfaccia amministrativa",
 'click to check for upgrades': 'clicca per controllare presenza di aggiornamenti',
 'code': 'code',
+'collapse/expand all': 'collapse/expand all',
+'Compile': 'compila',
 'compiled application removed': "rimosso il codice compilato dell'applicazione",
+'Controller': 'Controller',
+'Controllers': 'Controllers',
 'controllers': 'controllers',
+'Copyright': 'Copyright',
+'Create': 'crea',
 'create file with filename:': 'crea un file col nome:',
 'create new application:': 'create new application:',
+'Create new simple application': 'Crea nuova applicazione',
+'Create/Upload': 'Create/Upload',
 'created by': 'creato da',
 'crontab': 'crontab',
+'Current request': 'Richiesta (request) corrente',
+'Current response': 'Risposta (response) corrente',
+'Current session': 'Sessione (session) corrente',
 'currently running': 'currently running',
 'currently saved or': 'attualmente salvato o',
 'customize me!': 'Personalizzami!',
 'data uploaded': 'dati caricati',
+'Database': 'Database',
 'database': 'database',
 'database %s select': 'database %s select',
 'database administration': 'amministrazione database',
+'Date and Time': 'Data and Ora',
 'db': 'db',
+'DB Model': 'Modello di DB',
+'Debug': 'Debug',
 'defines tables': 'defininisce le tabelle',
+'Delete': 'Cancella',
 'delete': 'Cancella',
 'delete all checked': 'cancella tutti i selezionati',
 'delete plugin': 'cancella plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'Cancella:',
+'Deploy': 'deploy',
+'Deploy on Google App Engine': 'Installa su Google App Engine',
+'Deploy to OpenShift': 'Deploy to OpenShift',
 'design': 'progetta',
+'Detailed traceback description': 'Detailed traceback description',
 'direction: ltr': 'direction: ltr',
+'Disable': 'Disable',
+'docs': 'docs',
 'done!': 'fatto!',
+'download layouts': 'download layouts',
+'download plugins': 'download plugins',
+'EDIT': 'MODIFICA',
+'Edit': 'modifica',
+'Edit application': 'Modifica applicazione',
 'edit controller': 'modifica controller',
+'edit controller:': 'edit controller:',
+'Edit current record': 'Modifica record corrente',
 'edit profile': 'modifica profilo',
+'Edit This App': 'Modifica questa applicazione',
 'edit views:': 'modifica viste (view):',
+'Editing %s': 'Editing %s',
+'Enterprise Web Framework': 'Enterprise Web Framework',
+'Error logs for "%(app)s"': 'Log degli errori per "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'errori',
+'Exception instance attributes': 'Exception instance attributes',
+'Exit Fullscreen': 'Exit Fullscreen',
+'Expand Abbreviation': 'Expand Abbreviation',
 'export as csv file': 'esporta come file CSV',
 'exposes': 'espone',
+'exposes:': 'exposes:',
 'extends': 'estende',
 'failed to reload module because:': 'ricaricamento modulo fallito perché:',
 'file "%(filename)s" created': 'creato il file "%(filename)s"',
@@ -195,73 +145,213 @@
 'file does not exist': 'file inesistente',
 'file saved on %(time)s': "file salvato nell'istante %(time)s",
 'file saved on %s': 'file salvato: %s',
+'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'I test delle funzioni senza "doctests" risulteranno sempre [passed].',
+'Get from URL:': 'Get from URL:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'graph model': 'graph model',
+'Hello World': 'Salve Mondo',
+'Help': 'aiuto',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
 'htmledit': 'modifica come html',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'Import/Export': 'Importa/Esporta',
 'includes': 'include',
+'Index': 'Indice',
 'insert new': 'inserisci nuovo',
 'insert new %s': 'inserisci nuovo %s',
+'inspect attributes': 'inspect attributes',
+'Install': 'installa',
+'Installed applications': 'Applicazioni installate',
 'internal error': 'errore interno',
+'Internal State': 'Stato interno',
+'Invalid action': 'Azione non valida',
 'invalid password': 'password non valida',
+'Invalid Query': 'Richiesta (query) non valida',
 'invalid request': 'richiesta non valida',
 'invalid ticket': 'ticket non valido',
+'Key bindings': 'Key bindings',
+'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
 'language file "%(filename)s" created/updated': 'file linguaggio "%(filename)s" creato/aggiornato',
+'Language files (static strings) updated': 'Linguaggi (documenti con stringhe statiche) aggiornati',
 'languages': 'linguaggi',
+'Languages': 'Linguaggi',
+'Last saved on:': 'Ultimo salvataggio:',
+'Layout': 'Layout',
+'License for': 'Licenza relativa a',
 'loading...': 'caricamento...',
+'locals': 'locals',
+'Login': 'Accesso',
 'login': 'accesso',
+'Login to the Administrative Interface': "Accesso all'interfaccia amministrativa",
+'Logout': 'uscita',
+'Main Menu': 'Menu principale',
+'Manage': 'Manage',
+'Menu Model': 'Menu Modelli',
 'merge': 'unisci',
+'Models': 'Modelli',
 'models': 'modelli',
+'Modules': 'Moduli',
 'modules': 'moduli',
 'new application "%s" created': 'creata la nuova applicazione "%s"',
+'New application wizard': 'New application wizard',
 'new plugin installed': 'installato nuovo plugin',
+'New Record': 'Nuovo elemento (record)',
 'new record inserted': 'nuovo record inserito',
+'New simple application': 'New simple application',
 'next 100 rows': 'prossime 100 righe',
+'NO': 'NO',
+'No databases in this application': 'Nessun database presente in questa applicazione',
 'no match': 'nessuna corrispondenza',
+'no package selected': 'no package selected',
+'online designer': 'online designer',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'oppure importa da file CSV',
 'or provide app url:': "oppure fornisci url dell'applicazione:",
+'Original/Translation': 'Originale/Traduzione',
+'Overwrite installed app': 'sovrascrivi applicazione installata',
+'Pack all': 'crea pacchetto',
+'Pack compiled': 'crea pacchetto del codice compilato',
+'Pack custom': 'Pack custom',
 'pack plugin': 'crea pacchetto del plugin',
+'PAM authenticated user, cannot change password here': 'utente autenticato tramite PAM, impossibile modificare password qui',
 'password changed': 'password modificata',
+'Peeking at file': 'Uno sguardo al file',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" cancellato',
+'Plugin "%s" in application': 'Plugin "%s" nell\'applicazione',
+'plugins': 'plugins',
+'Plugins': 'I Plugins',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Powered by',
 'previous 100 rows': '100 righe precedenti',
+'Private files': 'Private files',
+'private files': 'private files',
+'Query:': 'Richiesta (query):',
+'Rapid Search': 'Rapid Search',
 'record': 'record',
 'record does not exist': 'il record non esiste',
 'record id': 'ID del record',
 'register': 'registrazione',
+'reload': 'reload',
+'Reload routes': 'Reload routes',
+'Remove compiled': 'rimozione codice compilato',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'request': 'request',
+'Resolve Conflict file': 'File di risoluzione conflitto',
+'response': 'response',
 'restore': 'ripristino',
 'revert': 'versione precedente',
+'Rows in table': 'Righe nella tabella',
+'Rows selected': 'Righe selezionate',
+'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': 'Running on %s',
+'Save': 'Save',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Hash del file salvato:',
 'selected': 'selezionato',
+'session': 'session',
 'session expired': 'sessions scaduta',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
+'Site': 'sito',
 'some files could not be removed': 'non è stato possibile rimuovere alcuni files',
+'Start searching': 'Start searching',
+'Start wizard': 'start wizard',
 'state': 'stato',
 'static': 'statico',
+'Static': 'Static',
+'Static files': 'Files statici',
+'Stylesheet': 'Foglio di stile (stylesheet)',
+'Submit': 'Submit',
 'submit': 'invia',
+'successful': 'successful',
+'Sure you want to delete this object?': 'Vuoi veramente cancellare questo oggetto?',
 'table': 'tabella',
 'test': 'test',
+'Testing application': 'Test applicazione in corsg',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La richiesta (query) è una condizione come ad esempio  "db.tabella1.campo1==\'valore\'". Una condizione come "db.tabella1.campo1==db.tabella2.campo2" produce un "JOIN" SQL.',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'logica dell\'applicazione, ogni percorso "URL" corrisponde ad una funzione esposta da un controller',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'the data representation, define database tables and sets': 'rappresentazione dei dati, definizione di tabelle di database e di "set" ',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
 'the presentations layer, views are also known as templates': 'Presentazione dell\'applicazione, viste (views, chiamate anche "templates")',
+'There are no controllers': 'Non ci sono controller',
+'There are no models': 'Non ci sono modelli',
+'There are no modules': 'Non ci sono moduli',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': 'Non ci sono file statici',
+'There are no translators, only default language is supported': 'Non ci sono traduzioni, viene solo supportato il linguaggio di base',
+'There are no views': 'Non ci sono viste ("view")',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'questi files vengono serviti così come sono, le immagini vanno qui',
+'This is the %(filename)s template': 'Questo è il template %(filename)s',
+'Ticket': 'Ticket',
+'Ticket ID': 'Ticket ID',
+'TM': 'TM',
 'to  previous version.': 'torna a versione precedente',
+'To create a plugin, name a file/folder plugin_[name]': 'Per creare un plugin, chiamare un file o cartella plugin_[nome]',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
 'translation strings for the application': "stringhe di traduzioni per l'applicazione",
+'Translation strings for the application': 'Translation strings for the application',
 'try': 'prova',
 'try something like': 'prova qualcosa come',
+'Try the mobile interface': 'Try the mobile interface',
+'try view': 'try view',
+'Unable to check for upgrades': 'Impossibile controllare presenza di aggiornamenti',
 'unable to create application "%s"': 'impossibile creare applicazione "%s"',
 'unable to delete file "%(filename)s"': 'impossibile rimuovere file "%(plugin)s"',
 'unable to delete file plugin "%(plugin)s"': 'impossibile rimuovere file di plugin "%(plugin)s"',
+'Unable to download app because:': 'Impossibile scaricare applicazione perché',
+'Unable to download because': 'Impossibile scaricare perché',
+'Unable to download because:': 'Unable to download because:',
 'unable to parse csv file': 'non riesco a decodificare questo file CSV',
 'unable to uninstall "%s"': 'impossibile disinstallare "%s"',
 'unable to upgrade because "%s"': 'impossibile aggiornare perché "%s"',
 'uncheck all': 'smarca tutti',
+'Uninstall': 'disinstalla',
 'update': 'aggiorna',
 'update all languages': 'aggiorna tutti i linguaggi',
+'Update:': 'Aggiorna:',
 'upgrade web2py now': 'upgrade web2py now',
+'upload': 'upload',
+'Upload': 'Upload',
+'Upload & install packed application': 'Carica ed installa pacchetto con applicazione',
+'Upload a package:': 'Upload a package:',
+'Upload and install packed application': 'Upload and install packed application',
 'upload application:': 'carica applicazione:',
 'upload file:': 'carica file:',
 'upload plugin file:': 'carica file di plugin:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Per costruire richieste (query) più complesse si usano (...)&(...) come "e" (AND), (...)|(...) come "o" (OR), e ~(...) come negazione (NOT).',
+'Use an url:': 'Use an url:',
 'variables': 'variables',
+'Version': 'Versione',
+'Version %s.%s.%s %s (%s)': 'Version %s.%s.%s %s (%s)',
+'Version %s.%s.%s (%s) %s': 'Version %s.%s.%s (%s) %s',
 'versioning': 'sistema di versioni',
+'Versioning': 'Versioning',
+'View': 'Vista',
 'view': 'vista',
+'Views': 'viste',
 'views': 'viste',
-'web2py Recent Tweets': 'Tweets recenti per web2py',
+'Web Framework': 'Web Framework',
 'web2py is up to date': 'web2py è aggiornato',
+'web2py Recent Tweets': 'Tweets recenti per web2py',
 'web2py upgraded; please restart it': 'web2py aggiornato; prego riavviarlo',
+'Welcome %s': 'Benvenuto %s',
+'Welcome to web2py': 'Benvenuto su web2py',
+'YES': 'SI',
 }
--- a/applications/admin/languages/plural-uk.py
+++ b/applications/admin/languages/plural-uk.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 {
 # "singular form (0)": ["first plural form (1)", "second plural form (2)", ...],
+'останній': ['останні','останніх'],
 'файл': ['файли','файлів'],
+'твіт': ['твіти','твітів'],
 }
--- a/applications/admin/languages/ru.py
+++ b/applications/admin/languages/ru.py
@@ -92,7 +92,7 @@
 'Database': 'База данных',
 'database': 'база данных',
 'database %s select': 'Выбор базы данных %s ',
-'database administration': 'администраторирование базы данных',
+'database administration': 'администрирование базы данных',
 'Date and Time': 'Дата и время',
 'db': 'бд',
 'DB Model': 'Модель БД',
@@ -134,7 +134,7 @@
 'Editing Language file': 'Правка языкового файла',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Enterprise Web Framework': 'Enterprise Web Framework',
-'Error logs for "%(app)s"': 'Журнал ошибок для "%(app)"',
+'Error logs for "%(app)s"': 'Журнал ошибок для "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'Ошибка',
--- a/applications/admin/languages/sr-cr.py
+++ b/applications/admin/languages/sr-cr.py
@@ -0,0 +1,212 @@
+# coding: utf8
+{
+'!langcode!': 'sr-cr',
+'!langname!': 'Српски (Ћирилица)',
+'%Y-%m-%d': '%d-%m-%Y',
+'%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
+'(requires internet access)': '(захтијева приступ интернету)',
+'(something like "it-it")': '(нешто као "it-it")',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(датотека **gluon/contrib/plural_rules/%s.py** није пронађена)',
+'About': 'Информације',
+'About application': 'О апликацији',
+'Additional code for your application': 'Додатни код за апликацију',
+'admin disabled because unable to access password file': 'администрација онемогућена јер не могу приступити датотеци са лозинком',
+'Admin language': 'Језик администратора',
+'administrative interface': 'административни интерфејс',
+'Administrator Password:': 'Лозинка администратора:',
+'and rename it:': 'и преименуј у:',
+'Application name:': 'Назив апликације:',
+'are not used': 'није кориштено',
+'are not used yet': 'није још кориштено',
+'Are you sure you want to delete this object?': 'Да ли сте сигурни да желите обрисати?',
+'arguments': 'arguments',
+'at char %s': 'код слова %s',
+'at line %s': 'на линији %s',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'back': 'назад',
+'Basics': 'Основе',
+'Begin': 'Почетак',
+'cache, errors and sessions cleaned': 'кеш, грешке и сесије су обрисани',
+'can be a git repo': 'може бити git repo',
+'cannot upload file "%(filename)s"': 'не мофу отпремити датотеку "%(filename)s"',
+'Change admin password': 'Промијени лзинку администратора',
+'check all': 'check all',
+'Check for upgrades': 'Провјери могућност надоградње',
+'Checking for upgrades...': 'Провјеравам могућност надоградње...',
+'Clean': 'Прочисти',
+'Click row to expand traceback': 'Click row to expand traceback',
+'code': 'код',
+'collapse/expand all': 'сакрити/приказати све',
+'Compile': 'Компајлирај',
+'Controllers': 'Контролери',
+'controllers': 'контролери',
+'Count': 'Count',
+'Create': 'Креирај',
+'create file with filename:': 'Креирај датотеку под називом:',
+'Create rules': 'Креирај правила',
+'created by': 'израдио',
+'crontab': 'crontab',
+'currently running': 'тренутно покренут',
+'currently saved or': 'тренутно сачувано или',
+'database administration': 'администрација базе података',
+'Debug': 'Debug',
+'defines tables': 'дефинише табеле',
+'delete': 'обриши',
+'Delete': 'Обриши',
+'delete all checked': 'delete all checked',
+'Delete this file (you will be asked to confirm deletion)': 'Обриши ову даатотеку (бићете упитани за потврду брисања)',
+'Deploy': 'Постави',
+'Deploy on Google App Engine': 'Постави на Google App Engine',
+'Deploy to OpenShift': 'Постави на OpenShift',
+'Detailed traceback description': 'Detailed traceback description',
+'direction: ltr': 'direction: ltr',
+'Disable': 'Искључи',
+'docs': 'документација',
+'download layouts': 'преузми layouts',
+'download plugins': 'преузми plugins',
+'Edit': 'Уређивање',
+'edit all': 'уреди све',
+'Edit application': 'Уреди апликацију',
+'edit controller': 'уреди контролер',
+'edit views:': 'уреди views:',
+'Editing file "%s"': 'Уређивање датотеке "%s"',
+'Editing Language file': 'Уређивање језичке датотеке',
+'Error': 'Грешка',
+'Error logs for "%(app)s"': 'Преглед грешака за "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'Грешке',
+'Exception instance attributes': 'Exception instance attributes',
+'Expand Abbreviation': 'Expand Abbreviation',
+'exposes': 'exposes',
+'exposes:': 'exposes:',
+'extends': 'проширује',
+'failed to compile file because:': 'нисам могао да компајлирам због:',
+'File': 'Датотека',
+'file does not exist': 'датотека не постоји',
+'file saved on %s': 'датотека сачувана на %s',
+'filter': 'филтер',
+'Find Next': 'Пронађи сљедећи',
+'Find Previous': 'Пронађи претходни',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'Generate': 'Generate',
+'Get from URL:': 'Преузми са странице:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Go to Matching Pair': 'Go to Matching Pair',
+'go!': 'крени!',
+'Help': 'Помоћ',
+'Hide/Show Translated strings': 'Сакрити/Приказати преведене ријечи',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'includes': 'укључује',
+'inspect attributes': 'inspect attributes',
+'Install': 'Инсталирај',
+'Installed applications': 'Инсталиране апликације',
+'invalid password.': 'погрешна лозинка.',
+'Key bindings': 'Пречице',
+'Key bindings for ZenCoding Plugin': 'Пречице за ZenCoding Plugin',
+'Language files (static strings) updated': 'Језичке датотеке су ажуриране',
+'languages': 'језици',
+'Languages': 'Језици',
+'Last saved on:': 'Посљедња измјена:',
+'License for': 'Лиценца за',
+'loading...': 'преузимам...',
+'locals': 'locals',
+'Login': 'Пријава',
+'Login to the Administrative Interface': 'Пријава за административни интерфејс',
+'Logout': 'Излаз',
+'Match Pair': 'Match Pair',
+'Merge Lines': 'Споји линије',
+'models': 'models',
+'Models': 'Models',
+'Modules': 'Modules',
+'modules': 'modules',
+'New Application Wizard': 'Чаробњак за нове апликације',
+'New application wizard': 'Чаробњак за нове апликације',
+'New simple application': 'Нова једноставна апликација',
+'Next Edit Point': 'Next Edit Point',
+'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
+'online designer': 'онлајн дизајнер',
+'Original/Translation': 'Оргинал/Превод',
+'Overwrite installed app': 'Пребриши постојећу апликацију',
+'Pack all': 'Запакуј све',
+'Peeking at file': 'Peeking at file',
+'Plugins': 'Plugins',
+'plugins': 'plugins',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Омогућио',
+'Previous Edit Point': 'Previous Edit Point',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Напредак пројекта',
+'Reload routes': 'Обнови преусмјерења',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Замијени',
+'Replace All': 'Замијени све',
+'request': 'request',
+'response': 'response',
+'restart': 'restart',
+'restore': 'restore',
+'revert': 'revert',
+'rules are not defined': 'правила нису дефинисана',
+'rules:': 'правила:',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Покренути на %s',
+'Save': 'Сачувај',
+'Save via Ajax': 'сачувај via Ajax',
+'Saved file hash:': 'Сачувано као хаш:',
+'session': 'сесија',
+'session expired': 'сесија истекла',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
+'shell': 'shell',
+'Site': 'Сајт',
+'skip to generate': 'skip to generate',
+'Start a new app': 'Покрени нову апликацију',
+'Start searching': 'Покрени претрагу',
+'Start wizard': 'Покрени чаробњака',
+'static': 'static',
+'Static files': 'Static files',
+'Step': 'Корак',
+'Submit': 'Прихвати',
+'successful': 'успјешан',
+'test': 'тест',
+'Testing application': 'Тестирање апликације',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
+'There are no models': 'There are no models',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket nedostaje',
+'to  previous version.': 'на претходну верзију.',
+'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
+'Translation strings for the application': 'Ријечи у апликацији које треба превести',
+'Try the mobile interface': 'Пробај мобилни интерфејс',
+'try view': 'try view',
+'uncheck all': 'uncheck all',
+'Uninstall': 'Деинсталирај',
+'update': 'ажурирај',
+'update all languages': 'ажурирај све језике',
+'upload': 'Отпреми',
+'Upload a package:': 'Преузми пакет:',
+'Upload and install packed application': 'Преузми и инсталирај запаковану апликацију',
+'upload file:': 'преузми датотеку:',
+'upload plugin file:': 'преузми плагин датотеку:',
+'variables': 'variables',
+'Version': 'Верзија',
+'Version %s.%s.%s (%s) %s': 'Верзија %s.%s.%s (%s) %s',
+'Versioning': 'Versioning',
+'views': 'views',
+'Views': 'Views',
+'Web Framework': 'Web Framework',
+'web2py is up to date': 'web2py је ажуран',
+'web2py Recent Tweets': 'web2py Recent Tweets',
+'Wrap with Abbreviation': 'Wrap with Abbreviation',
+}
--- a/applications/admin/languages/sr-lt.py
+++ b/applications/admin/languages/sr-lt.py
@@ -0,0 +1,212 @@
+# coding: utf8
+{
+'!langcode!': 'sr-lt',
+'!langname!': 'Srpski (Latinica)',
+'%Y-%m-%d': '%d-%m-%Y',
+'%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
+'(requires internet access)': '(zahtijeva pristup internetu)',
+'(something like "it-it")': '(nešto kao "it-it")',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(datoteka **gluon/contrib/plural_rules/%s.py** nije pronađena)',
+'About': 'Informacije',
+'About application': 'O aplikaciji',
+'Additional code for your application': 'Dodatni kod za aplikaciju',
+'admin disabled because unable to access password file': 'administracija onemogućena jer ne mogu pristupiti datoteci sa lozinkom',
+'Admin language': 'Jezik administratora',
+'administrative interface': 'administrativni interfejs',
+'Administrator Password:': 'Lozinka administratora:',
+'and rename it:': 'i preimenuj u:',
+'Application name:': 'Naziv aplikacije:',
+'are not used': 'nije korišteno',
+'are not used yet': 'nije još korišteno',
+'Are you sure you want to delete this object?': 'Da li ste sigurni da želite obrisati?',
+'arguments': 'arguments',
+'at char %s': 'kod slova %s',
+'at line %s': 'na liniji %s',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'back': 'nazad',
+'Basics': 'Osnove',
+'Begin': 'Početak',
+'cache, errors and sessions cleaned': 'keš, greške i sesije su obrisani',
+'can be a git repo': 'može biti git repo',
+'cannot upload file "%(filename)s"': 'ne mogu otpremiti datoteku "%(filename)s"',
+'Change admin password': 'Promijeni lozinku administratora',
+'check all': 'check all',
+'Check for upgrades': 'Provjeri mogućnost nadogradnje',
+'Checking for upgrades...': 'Provjeravam mogućnost nadogradnje...',
+'Clean': 'Pročisti',
+'Click row to expand traceback': 'Click row to expand traceback',
+'code': 'kod',
+'collapse/expand all': 'sakriti/prikazati sve',
+'Compile': 'Kompajliraj',
+'Controllers': 'Kontroleri',
+'controllers': 'kontroleri',
+'Count': 'Count',
+'Create': 'Kreiraj',
+'create file with filename:': 'Kreiraj datoteku pod nazivom:',
+'Create rules': 'Kreiraj pravila',
+'created by': 'izradio',
+'crontab': 'crontab',
+'currently running': 'trenutno pokrenut',
+'currently saved or': 'trenutno sačuvano ili',
+'database administration': 'administracija baze podataka',
+'Debug': 'Debug',
+'defines tables': 'definiše tabele',
+'delete': 'obriši',
+'Delete': 'Obriši',
+'delete all checked': 'delete all checked',
+'Delete this file (you will be asked to confirm deletion)': 'Obriši ovu datoteku (bićete upitani za potvrdu brisanja)',
+'Deploy': 'Postavi',
+'Deploy on Google App Engine': 'Postavi na Google App Engine',
+'Deploy to OpenShift': 'Postavi na OpenShift',
+'Detailed traceback description': 'Detailed traceback description',
+'direction: ltr': 'direction: ltr',
+'Disable': 'Isključi',
+'docs': 'dokumentacija',
+'download layouts': 'preuzmi layouts',
+'download plugins': 'preuzmi plugins',
+'Edit': 'Uređivanje',
+'edit all': 'uredi sve',
+'Edit application': 'Uredi aplikaciju',
+'edit controller': 'uredi controller',
+'edit views:': 'uredi views:',
+'Editing file "%s"': 'Uređivanje datoteke "%s"',
+'Editing Language file': 'Uređivanje jezičke datoteke',
+'Error': 'Greška',
+'Error logs for "%(app)s"': 'Pregled grešaka za "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'Greške',
+'Exception instance attributes': 'Exception instance attributes',
+'Expand Abbreviation': 'Expand Abbreviation',
+'exposes': 'exposes',
+'exposes:': 'exposes:',
+'extends': 'proširuje',
+'failed to compile file because:': 'nisam mogao da kompajliram zbog:',
+'File': 'Datoteka',
+'file does not exist': 'datoteka ne postoji',
+'file saved on %s': 'datoteka sačuvana na %s',
+'filter': 'filter',
+'Find Next': 'Pronađi sljedeći',
+'Find Previous': 'Pronađi prethodni',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'Generate': 'Generate',
+'Get from URL:': 'Preuzmi sa stranice:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Go to Matching Pair': 'Go to Matching Pair',
+'go!': 'kreni!',
+'Help': 'Pomoć',
+'Hide/Show Translated strings': 'Sakriti/Prikazati prevedene riječi',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
+'includes': 'uključuje',
+'inspect attributes': 'inspect attributes',
+'Install': 'Instaliraj',
+'Installed applications': 'Instalirane aplikacije',
+'invalid password.': 'pogrešna lozinka.',
+'Key bindings': 'Prečice',
+'Key bindings for ZenCoding Plugin': 'Prečice za for ZenCoding Plugin',
+'Language files (static strings) updated': 'Jezičke datoteke su ažurirane',
+'languages': 'jezici',
+'Languages': 'Jezici',
+'Last saved on:': 'Posljednja izmjena:',
+'License for': 'Licenca za',
+'loading...': 'preuzimam...',
+'locals': 'locals',
+'Login': 'Prijava',
+'Login to the Administrative Interface': 'Prijava za administrativni interfejs',
+'Logout': 'Izlaz',
+'Match Pair': 'Match Pair',
+'Merge Lines': 'Spoji linije',
+'models': 'models',
+'Models': 'Models',
+'Modules': 'Modules',
+'modules': 'modules',
+'New Application Wizard': 'Čarobnjak za nove aplikacije',
+'New application wizard': 'Čarobnjak za nove aplikacije',
+'New simple application': 'Nova jednostavna aplikacija',
+'Next Edit Point': 'Next Edit Point',
+'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
+'online designer': 'onlajn dizajner',
+'Original/Translation': 'Original/Prevod',
+'Overwrite installed app': 'Prebriši postojeću aplikaciju',
+'Pack all': 'Zapakuj sve',
+'Peeking at file': 'Peeking at file',
+'Plugins': 'Plugins',
+'plugins': 'plugins',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Omogućio',
+'Previous Edit Point': 'Previous Edit Point',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Napredak projekta',
+'Reload routes': 'Obnovi preusmjerenja',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Zamijeni',
+'Replace All': 'Zamijeni sve',
+'request': 'request',
+'response': 'response',
+'restart': 'restart',
+'restore': 'restore',
+'revert': 'revert',
+'rules are not defined': 'pravila nisu definisana',
+'rules:': 'pravila:',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
+'Running on %s': 'Pokrenuto na %s',
+'Save': 'Sačuvaj',
+'Save via Ajax': 'Sačuvaj via Ajax',
+'Saved file hash:': 'Sačuvano kao haš:',
+'session': 'sesija',
+'session expired': 'sesija istekla',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
+'shell': 'shell',
+'Site': 'Sajt',
+'skip to generate': 'skip to generate',
+'Start a new app': 'Pokreni novu aplikaciju',
+'Start searching': 'Pokreni pretragu',
+'Start wizard': 'Pokreni čarobnjaka',
+'static': 'static',
+'Static files': 'Static files',
+'Step': 'Korak',
+'Submit': 'Prihvati',
+'successful': 'uspješan',
+'test': 'test',
+'Testing application': 'Testing application',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
+'There are no models': 'There are no models',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
+'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket nedostaje',
+'to  previous version.': 'na prethodnu verziju.',
+'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
+'Translation strings for the application': 'Riječi u aplikaciji koje treba prevesti',
+'Try the mobile interface': 'Probaj mobilni interfejs',
+'try view': 'try view',
+'uncheck all': 'uncheck all',
+'Uninstall': 'Deinstaliraj',
+'update': 'ažuriraj',
+'update all languages': 'ažuriraj sve jezike',
+'upload': 'Otpremi',
+'Upload a package:': 'Preuzmi paket:',
+'Upload and install packed application': 'Preuzmi i instaliraj zapakovanu aplikaciju',
+'upload file:': 'preuzmi datoteku:',
+'upload plugin file:': 'preuzmi plugin datoteku:',
+'variables': 'variables',
+'Version': 'Verzija',
+'Version %s.%s.%s (%s) %s': 'Verzija %s.%s.%s (%s) %s',
+'Versioning': 'Versioning',
+'views': 'views',
+'Views': 'Views',
+'Web Framework': 'Web Framework',
+'web2py is up to date': 'web2py je ažuran',
+'web2py Recent Tweets': 'web2py Recent Tweets',
+'Wrap with Abbreviation': 'Wrap with Abbreviation',
+}
--- a/applications/admin/languages/uk.py
+++ b/applications/admin/languages/uk.py
@@ -8,12 +8,16 @@
 '%s': '%s',
 '%s %%{row} deleted': 'Вилучено %s %%{рядок}',
 '%s %%{row} updated': 'Вилучено %s %%{рядок}',
-'%s Recent Tweets': '%s останніх твітів',
+'%s Recent Tweets': '%s %%{останній} %%{твіт}',
 '%s students registered': '%s студентів зареєстровано',
 '%Y-%m-%d': '%Y/%m/%d',
 '%Y-%m-%d %H:%M:%S': '%Y/%m/%d %H:%M:%S',
 '(requires internet access)': '(потрібно мати доступ в інтернет)',
+'(requires internet access, experimental)': '(потрібно мати доступ в інтернет, експериментально)',
 '(something like "it-it")': '(щось схоже на "uk-ua")',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(не існує файлу **gluon/contrib/plural_rules/%s.py**)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'Сталась помилка, будь-ласка [[переватажте %s]] сторінку',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Інтерфейс системи контролю версій Mercurial[[NEWLINE]]для додатку '%s'",
 '@markmin\x01Searching: **%s** %%{file}': 'Знайдено: **%s** %%{файл}',
 'Abort': 'Припинити',
 'About': 'Про',
@@ -33,10 +37,12 @@
 'App does not exist or your are not authorized': 'Додаток не існує, або ви не авторизовані',
 'appadmin': 'Aдм.панель',
 'appadmin is disabled because insecure channel': "адмін.панель відключено через використання ненадійного каналу зв'язку",
+'Application': 'Додаток (Application)',
 'application "%s" uninstalled': 'додаток "%s" вилучено',
 'application %(appname)s installed with md5sum: %(digest)s': 'додаток %(appname)s встановлено з md5sum: %(digest)s',
 'Application cannot be generated in demo mode': 'В демо-режимі генерувати додатки не можна',
 'application compiled': 'додаток скомпільовано',
+'Application exists already': 'Додаток вже існує',
 'application is compiled and cannot be designed': 'додаток скомпільований. налаштування змінювати не можна',
 'Application name:': 'Назва додатку:',
 'are not used': 'не використовуються',
@@ -52,6 +58,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': "УВАГА: Вхід потребує надійного (HTTPS) з'єднання або запуску на локальному комп'ютері.",
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ОБЕРЕЖНО: ТЕСТУВАННЯ НЕ Є ПОТОКО-БЕЗПЕЧНИМ, ТОЖ НЕ ЗАПУСКАЙТЕ ДЕКІЛЬКА ТЕСТІВ ОДНОЧАСНО.',
 'ATTENTION: you cannot edit the running application!': 'УВАГА: Ви не можете редагувати додаток, який зараз виконуєте!',
+'Autocomplete Python Code': 'Автозавершення коду на Python',
 'Available databases and tables': 'Доступні бази даних та таблиці',
 'back': '<< назад',
 'bad_resource': 'поганий_ресурс',
@@ -72,6 +79,7 @@
 'cannot create file': 'не можу створити файл',
 'cannot upload file "%(filename)s"': 'не можу завантажити файл "%(filename)s"',
 'Change admin password': 'Змінити пароль адміністратора',
+'change editor settings': 'змінити налаштування редактора',
 'check all': 'відмітити всі',
 'Check for upgrades': 'Перевірити оновлення',
 'Check to delete': 'Помітити на вилучення',
@@ -86,7 +94,9 @@
 'Code listing': 'Лістинг',
 'collapse/expand all': 'згорнути/розгорнути все',
 'Command': 'Команда',
+'Comment:': 'Пояснення:',
 'Commit': 'Комміт',
+'Commit form': 'Commit form',
 'Compile': 'Компілювати',
 'compiled application removed': 'скомпільований додаток вилучено',
 'Condition': 'Умова',
@@ -100,6 +110,7 @@
 'create file with filename:': 'створити файл з назвою:',
 'create plural-form': 'створити форму множини',
 'Create rules': 'Створити правила',
+'Create/Upload': 'Створити/Завантажити',
 'created by': 'Автор:',
 'Created On': 'Створено в',
 'crontab': 'таблиця cron',
@@ -147,8 +158,10 @@
 'edit all': 'редагувати всі',
 'Edit application': 'Налаштування додатку',
 'edit controller': 'редагувати контролер',
+'edit controller:': 'редагувати контролер:',
 'Edit current record': 'Редагувати поточний запис',
 'edit views:': 'редагувати відображення (views):',
+'Editing %s': 'Редагується %s',
 'Editing file "%s"': 'Редагується файл "%s"',
 'Editing Language file': 'Редагується файл перекладу',
 'Editing Plural Forms File': 'Редагується файл форм множини',
@@ -159,9 +172,11 @@
 'Error snapshot': 'Розгорнутий знімок стану (Error snapshot)',
 'Error ticket': 'Позначка (ticket) про помилку',
 'Errors': 'Помилки',
+'Errors in form, please check it out.': 'Помилка у формі, будь-ласка перевірте її.',
 'Exception %(extype)s: %(exvalue)s': 'Виключення %(extype)s: %(exvalue)s',
 'Exception %s': 'Виключення %s',
 'Exception instance attributes': 'Атрибути примірника класу Exception (виключення)',
+'Exit Fullscreen': 'Вийти з повноекранного режиму',
 'Expand Abbreviation': 'Розгорнути абревіатуру',
 'export as csv file': 'експортувати як файл csv',
 'exposes': 'обслуговує',
@@ -182,6 +197,8 @@
 'file saved on %s': 'файл збережено в %s',
 'Filename': "Ім'я файлу",
 'filter': 'фільтр',
+'Find Next': 'Шукати наступний',
+'Find Previous': 'Шукати попередній',
 'Frames': 'Стек викликів',
 'Functions with no doctests will result in [passed] tests.': 'Функції, в яких відсутні док-тести відносяться до функцій, які успішно пройшли тести.',
 'GAE Email': 'Ел.пошта GAE',
@@ -197,6 +214,7 @@
 'Google App Engine Deployment Interface': 'Інтерфейс розгортання Google App Engine',
 'Google Application Id': 'Ідентифікатор Google Application',
 'Goto': 'Перейти до',
+'graph model': 'графова модель',
 'Help': 'Допомога',
 'Hide/Show Translated strings': 'Сховати/показати ВЖЕ ПЕРЕКЛАДЕНІ рядки',
 'Hits': 'Спрацьовувань',
@@ -204,7 +222,7 @@
 'honored only if the expression evaluates to true': 'точка зупинки активується тільки за істинності умови',
 'If start the downgrade, be patient, it may take a while to rollback': 'Запустивши повернення на попередню версію, будьте терплячими, це може зайняти трохи часу',
 'If start the upgrade, be patient, it may take a while to download': 'Запустивши оновлення, будьте терплячими, потрібен час для завантаження необхідних даних',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Якщо в наданому вище звіті присутня позначка про помилку (ticket number), то це вказує на збій у виконанні контролера ще до початку запуску док-тестів. Це, зазвичай, сигналізує про помилку вирівнювання тексту програми (indention error) або помилку за межами функції (error outside function code). Зелений заголовок сигналізує, що всі тести (з наявних) пройшли успішно. В цьому випадку результат тестів показано не буде.',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Якщо в наданому вище звіті присутня позначка про помилку (ticket number), то це вказує на збій у виконанні контролера ще до початку запуску док-тестів. Це, зазвичай, сигналізує про помилку вирівнювання тексту програми (indention error) або помилку за межами функції (error outside function code).\n\t\tЗелений заголовок сигналізує, що всі тести (з наявних) пройшли успішно. В цьому випадку результат тестів показано не буде.',
 'Import/Export': 'Імпорт/Експорт',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'Під час розробки , використовуйте вбудований веб-сервер Rocket, він найкраще налаштований на спільну роботу з інтерактивним ладначем.',
 'includes': 'включає',
@@ -241,6 +259,8 @@
 'License for': 'Ліцензія додатку',
 'Line number': '№ рядка',
 'LineNo': '№ рядка',
+'lists by exception': 'список виключень (exceptions)',
+'lists by ticket': 'список позначок (tickets)',
 'loading...': 'завантаження...',
 'locals': 'локальні',
 'Locals##debug': 'Локальні змінні',
@@ -249,6 +269,7 @@
 'Login to the Administrative Interface': 'Вхід в адміністративний інтерфейс',
 'Logout': 'Вихід',
 'Main Menu': 'Основне меню',
+'Manage': 'Керувати',
 'Manage Admin Users/Students': 'Адміністратор керування користувачами/студентами',
 'Manage Students': 'Керувати студентами',
 'Match Pair': 'Знайти пару',
@@ -278,6 +299,7 @@
 'No databases in this application': 'Даний додаток не використовує бази даних',
 'No Interaction yet': 'Ладнач не активовано',
 'no match': 'співпадань нема',
+'no package selected': 'пакет не вибрано',
 'no permission to uninstall "%s"': 'нема прав на вилучення (uninstall) "%s"',
 'No ticket_storage.txt found under /private folder': 'В каталозі /private відсутній файл ticket_storage.txt',
 'Not Authorized': 'Не дозволено',
@@ -286,11 +308,14 @@
 'online designer': 'дизайнер БД',
 'OpenShift Deployment Interface': 'OpenShift: Інтерфейс розгортання',
 'OpenShift Output': 'Вивід OpenShift',
+'or alternatively': 'або альтернативно',
+'Or Get from URL:': 'Або Отримати з мережі (ч/з URL):',
 'or import from csv file': 'або імпортувати через csv-файл',
 'Original/Translation': 'Оригінал/переклад',
 'Overwrite installed app': 'Перезаписати встановлений додаток',
-'Pack all': 'Запак.все',
-'Pack compiled': 'Запак.компл',
+'Pack all': 'Пакувати все',
+'Pack compiled': 'Пакувати зкомпільоване',
+'Pack custom': 'Пакувати вибране',
 'pack plugin': 'запакувати втулку',
 'PAM authenticated user, cannot change password here': 'Ввімкнена система ідентифікації користувачів PAM. Для зміни паролю скористайтесь командами вашої ОС ',
 'password changed': 'пароль змінено',
@@ -318,13 +343,17 @@
 'Query:': 'Запит:',
 'RAM Cache Keys': 'Ключ ОЗП-кешу (RAM Cache)',
 'Ram Cleared': "Кеш в пам'яті очищено",
+'Rapid Search': 'Миттєвий пошук',
 'record': 'запис',
 'record does not exist': 'запису не існує',
 'record id': 'Ід.запису',
 'refresh': 'оновіть',
+'reload': 'перевантажити',
 'Reload routes': 'Перезавантажити маршрути',
 'Remove compiled': 'Вилуч.компл',
 'Removed Breakpoint on %s at line %s': 'Вилучено точку зупинки у %s в рядку %s',
+'Replace': 'Замінити',
+'Replace All': 'Замінити все',
 'request': 'запит',
 'requires python-git, but not installed': 'Для розгортання необхідний пакет python-git, але він не встановлений',
 'resolve': "розв'язати",
@@ -345,6 +374,8 @@
 'Running on %s': 'Запущено на %s',
 'runonce': 'одноразово',
 'Save': 'Зберегти',
+'Save file:': 'Зберегти файл:',
+'Save file: %s': 'Зберегти файл: %s',
 'Save via Ajax': 'зберегти через Ajax',
 'Saved file hash:': 'Хеш збереженого файлу:',
 'search': 'пошук',
@@ -362,8 +393,10 @@
 'some files could not be removed': 'деякі файли не можна вилучити',
 'Sorry, could not find mercurial installed': 'Не вдалось виявити встановлену систему контролю версій Mercurial',
 'Start a new app': 'Створюється новий додаток',
+'Start searching': 'Розпочати пошук',
 'Start wizard': 'Активувати майстра',
 'state': 'стан',
+'Static': 'Статичні',
 'static': 'статичні',
 'Static files': 'Статичні файли',
 'Step': 'Крок',
@@ -372,6 +405,7 @@
 'submit': 'застосувати',
 'Submit': 'Застосувати',
 'successful': 'успішно',
+'switch to : db': 'перемкнути на : БД',
 'table': 'таблиця',
 'tags': 'мітки (tags)',
 'Temporary': 'Тимчасово',
@@ -387,6 +421,7 @@
 'There are no models': 'Моделей, наразі, нема',
 'There are no modules': 'Модулів поки що нема',
 'There are no plugins': 'Жодної втулки, наразі, не встановлено',
+'There are no private files': 'Приватних файлів поки що нема',
 'There are no static files': 'Статичних файлів, наразі, нема',
 'There are no translators': 'Перекладів нема',
 'There are no translators, only default language is supported': 'Перекладів нема, підтримується тільки мова оригіналу',
@@ -405,6 +440,7 @@
 'ticket': 'позначка',
 'Ticket': 'Позначка (Ticket)',
 'Ticket ID': 'Ід.позначки (Ticket ID)',
+'Ticket Missing': 'Позначка (ticket) відсутня',
 'tickets': 'позначки (tickets)',
 'Time in Cache (h:m:s)': 'Час в кеші (г:хв:сек)',
 'to  previous version.': 'до попередньої версії.',
@@ -412,9 +448,11 @@
 'To emulate a breakpoint programatically, write:': 'Для встановлення точки зупинки  програмним чином напишіть:',
 'to use the debugger!': 'щоб активувати ладнач!',
 'toggle breakpoint': '+/- точку зупинки',
+'Toggle Fullscreen': 'Перемкнути на весь екран',
 'Traceback': 'Стек викликів (Traceback)',
 'Translation strings for the application': 'Пари рядків <оригінал>:<переклад> для вибраної мови',
 'try something like': 'спробуйте щось схоже на',
+'Try the mobile interface': 'Спробуйте мобільний інтерфейс',
 'try view': 'дивитись результат',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'наберіть тут будь-які команди ладнача PDB і натисніть клавішу [Return] ([Enter]), щоб запустити їх на виконання.',
 'Type python statement in here and hit Return (Enter) to execute it.': 'Наберіть тут будь-які вирази Python і натисніть клавішу [Return] ([Enter]), щоб запустити їх на виконання.',
@@ -442,8 +480,10 @@
 'Update:': 'Поновити:',
 'Upgrade': 'Оновити',
 'upgrade now': 'оновитись зараз',
+'upgrade now to %s': 'оновити зараз до %s',
 'upgrade_web2py': 'оновити web2py',
 'upload': 'завантажити',
+'Upload': 'Завантажити',
 'Upload a package:': 'Завантажити пакет:',
 'Upload and install packed application': 'Завантажити та встановити запакований додаток',
 'upload file:': 'завантажити файл:',
@@ -460,7 +500,7 @@
 'Views': 'Відображення (Views)',
 'views': 'відображення',
 'WARNING:': 'ПОПЕРЕДЖЕННЯ:',
-'Web Framework': 'Web Framework',
+'Web Framework': 'Веб-каркас (Web Framework)',
 'web2py apps to deploy': 'Готові до розгортання додатки web2py',
 'web2py Debugger': 'Ладнач web2py',
 'web2py downgrade': 'повернення на попередню версію web2py',
--- a/applications/admin/models/0.py
+++ b/applications/admin/models/0.py
@@ -1,27 +1,30 @@
 EXPIRATION = 60 * 60  # logout after 60 minutes of inactivity
 CHECK_VERSION = True
 WEB2PY_URL = 'http://web2py.com'
-WEB2PY_VERSION_URL = WEB2PY_URL+'/examples/default/version'
+WEB2PY_VERSION_URL = WEB2PY_URL + '/examples/default/version'

 ###########################################################################
 # Preferences for EditArea
 # the user-interface feature that allows you to edit files in your web
 # browser.

-## Default editor
-TEXT_EDITOR = 'ace' or 'edit_area' or 'amy'
+## 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", 
+    "chrome", "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn",
    "dreamweaver", "eclipse", "idle_fingers", "kr_theme", "merbivore",
-    "merbivore_soft", "monokai", "mono_industrial", "pastel_on_dark", 
+    "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)
-TEXT_EDITOR_KEYBINDING = '' #'emacs' or 'vi'
-    
-### edit_area
+
+## 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

@@ -57,9 +60,9 @@ GAE_APPCFG = os.path.abspath(os.path.join('/usr/local/bin/appcfg.py'))

 # To use web2py as a teaching tool, set MULTI_USER_MODE to True
 MULTI_USER_MODE = False
-EMAIL_SERVER    = 'localhost'
-EMAIL_SENDER    = 'professor@example.com'
-EMAIL_LOGIN     = None
+EMAIL_SERVER = 'localhost'
+EMAIL_SENDER = 'professor@example.com'
+EMAIL_LOGIN = None

 # configurable twitterbox, set to None/False to suppress
 TWITTER_HASH = "web2py"
@@ -76,5 +79,3 @@ 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)
-
-
--- a/applications/admin/models/0_imports.py
+++ b/applications/admin/models/0_imports.py
@@ -28,5 +28,3 @@ from gluon.languages import findT, update_all_languages
 from gluon.myregex import *
 from gluon.restricted import *
 from gluon.compileapp import compile_application, remove_compiled_application
-
-
--- a/applications/admin/models/access.py
+++ b/applications/admin/models/access.py
@@ -1,4 +1,6 @@
-import base64, os, time
+import base64
+import os
+import time
 from gluon import portalocker
 from gluon.admin import apath
 from gluon.fileutils import read_file
@@ -24,7 +26,8 @@ elif not request.is_local and not DEMO_MODE:
 try:
    _config = {}
    port = int(request.env.server_port or 0)
-    restricted(read_file(apath('../parameters_%i.py' % port, request)), _config)
+    restricted(
+        read_file(apath('../parameters_%i.py' % port, request)), _config)

    if not 'password' in _config or not _config['password']:
        raise HTTP(200, T('admin disabled because no admin password'))
@@ -38,19 +41,20 @@ except IOError:
            raise HTTP(200,
                       T('admin disabled because not supported on google app engine'))
    else:
-        raise HTTP(200, T('admin disabled because unable to access password file'))
+        raise HTTP(
+            200, T('admin disabled because unable to access password file'))


 def verify_password(password):
    session.pam_user = None
    if DEMO_MODE:
        return True
-    elif not 'password' in _config:
+    elif not _config.get('password'):
        return False
    elif _config['password'].startswith('pam_user:'):
        session.pam_user = _config['password'][9:].strip()
        import gluon.contrib.pam
-        return gluon.contrib.pam.authenticate(session.pam_user,password)
+        return gluon.contrib.pam.authenticate(session.pam_user, password)
    else:
        return _config['password'] == CRYPT()(password)[0]

@@ -63,6 +67,7 @@ deny_file = os.path.join(request.folder, 'private', 'hosts.deny')
 allowed_number_of_attempts = 5
 expiration_failed_logins = 3600

+
 def read_hosts_deny():
    import datetime
    hosts = {}
@@ -75,7 +80,7 @@ def read_hosts_deny():
                continue
            fields = line.strip().split()
            if len(fields) > 2:
-                hosts[fields[0].strip()] = ( # ip
+                hosts[fields[0].strip()] = (  # ip
                    int(fields[1].strip()),  # n attemps
                    int(fields[2].strip())   # last attempts
                    )
@@ -83,28 +88,30 @@ def read_hosts_deny():
        f.close()
    return hosts

+
 def write_hosts_deny(denied_hosts):
    f = open(deny_file, 'w')
    portalocker.lock(f, portalocker.LOCK_EX)
    for key, val in denied_hosts.items():
-        if time.time()-val[1] < expiration_failed_logins:
+        if time.time() - val[1] < expiration_failed_logins:
            line = '%s %s %s\n' % (key, val[0], val[1])
            f.write(line)
    portalocker.unlock(f)
    f.close()

+
 def login_record(success=True):
    denied_hosts = read_hosts_deny()
-    val = (0,0)
+    val = (0, 0)
    if success and request.client in denied_hosts:
        del denied_hosts[request.client]
    elif not success and not request.is_local:
-        val = denied_hosts.get(request.client,(0,0))
-        if time.time()-val[1]<expiration_failed_logins \
+        val = denied_hosts.get(request.client, (0, 0))
+        if time.time() - val[1] < expiration_failed_logins \
            and val[0] >= allowed_number_of_attempts:
-            return val[0] # locked out
-        time.sleep(2**val[0])
-        val = (val[0]+1,int(time.time()))
+            return val[0]  # locked out
+        time.sleep(2 ** val[0])
+        val = (val[0] + 1, int(time.time()))
        denied_hosts[request.client] = val
    write_hosts_deny(denied_hosts)
    return val[0]
@@ -123,17 +130,32 @@ if session.authorized:
    else:
        session.last_time = t0

+
+if request.vars.is_mobile in ('true', 'false', 'auto'):
+    session.is_mobile = request.vars.is_mobile or 'auto'
+if request.controller == 'default' and request.function == 'index':
+    if not request.vars.is_mobile:
+        session.is_mobile = 'auto'
+if not session.is_mobile:
+    session.is_mobile = 'auto'
+if session.is_mobile == 'true':
+    is_mobile = True
+elif session.is_mobile == 'false':
+    is_mobile = False
+else:
+    is_mobile = request.user_agent().is_mobile
+
 if request.controller == "webservices":
    basic = request.env.http_authorization
    if not basic or not basic[:6].lower() == 'basic ':
-        raise HTTP(401,"Wrong credentials")
+        raise HTTP(401, "Wrong credentials")
    (username, password) = base64.b64decode(basic[6:]).split(':')
    if not verify_password(password) or MULTI_USER_MODE:
        time.sleep(10)
-        raise HTTP(403,"Not authorized")
+        raise HTTP(403, "Not authorized")
 elif not session.authorized and not \
-    (request.controller == 'default' and \
-     request.function in ('index','user')):
+    (request.controller + '/' + request.function in
+     ('default/index', 'default/user', 'plugin_jqmobile/index', 'plugin_jqmobile/about')):

    if request.env.query_string:
        query_string = '?' + request.env.query_string
@@ -150,8 +172,6 @@ elif session.authorized and \
     request.function == 'index':
    redirect(URL(request.application, 'default', 'site'))

-
-if request.controller=='appadmin' and DEMO_MODE:
+if request.controller == 'appadmin' and DEMO_MODE:
    session.flash = 'Appadmin disabled in demo mode'
-    redirect(URL('default','sites'))
-
+    redirect(URL('default', 'sites'))
--- a/applications/admin/models/buttons.py
+++ b/applications/admin/models/buttons.py
@@ -2,37 +2,39 @@

 import os

-def A_button(*a,**b):
+
+def A_button(*a, **b):
    b['_data-role'] = 'button'
    b['_data-inline'] = 'true'
-    return A(*a,**b)
+    return A(*a, **b)

 def button(href, label):
-    if request.user_agent().is_mobile:
+    if is_mobile:
        ret = A_button(SPAN(label), _href=href)
    else:
-        ret = A(SPAN(label),_class='button',_href=href)
+        ret = A(SPAN(label), _class='button btn', _href=href)
    return ret

 def button_enable(href, app):
-    if os.path.exists(os.path.join(apath(app,r=request),'DISABLED')):
-        label = SPAN(T('Enable'),_style='color:red')
+    if os.path.exists(os.path.join(apath(app, r=request), 'DISABLED')):
+        label = SPAN(T('Enable'), _style='color:red')
    else:
-        label = SPAN(T('Disable'),_style='color:green')
-    id = 'enable_'+app
-    return A(label,_class='button',_id=id,callback=href,target=id)
+        label = SPAN(T('Disable'), _style='color:green')
+    id = 'enable_' + app
+    return A(label, _class='button btn', _id=id, callback=href, target=id)

 def sp_button(href, label):
    if request.user_agent().is_mobile:
        ret = A_button(SPAN(label), _href=href)
    else:
-        ret = A(SPAN(label),_class='button special',_href=href)
+        ret = A(SPAN(label), _class='button special btn btn-inverse', _href=href)
    return ret

 def helpicon():
    return IMG(_src=URL('static', 'images/help.png'), _alt='help')

 def searchbox(elementid):
-    return TAG[''](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))
-
-
+    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")
--- a/applications/admin/models/db.py
+++ b/applications/admin/models/db.py
@@ -4,37 +4,39 @@
 if MULTI_USER_MODE:
    db = DAL('sqlite://storage.sqlite')       # if not, use SQLite or other DB
    from gluon.tools import *
-    auth = Auth(globals(),db)                      # authentication/authorization
-    crud = Crud(globals(),db)                      # for CRUD helpers using auth
-    service = Service(globals())                   # for json, xml, jsonrpc, xmlrpc, amfrpc
+    auth = Auth(
+        globals(), db)                      # authentication/authorization
+    crud = Crud(
+        globals(), db)                      # for CRUD helpers using auth
+    service = Service(
+        globals())                   # for json, xml, jsonrpc, xmlrpc, amfrpc
    plugins = PluginManager()

    mail = auth.settings.mailer
    mail.settings.server = EMAIL_SERVER
    mail.settings.sender = EMAIL_SENDER
-    mail.settings.login =  EMAIL_LOGIN
+    mail.settings.login = EMAIL_LOGIN

    auth.settings.extra_fields['auth_user'] = \
-        [Field('is_manager','boolean',default=False,writable=False)]
+        [Field('is_manager', 'boolean', default=False, writable=False)]
    auth.define_tables()                           # creates all needed tables
    auth.settings.registration_requires_verification = False
    auth.settings.registration_requires_approval = True
    auth.settings.reset_password_requires_verification = True

-    db.define_table('app',Field('name'),Field('owner',db.auth_user))
+    db.define_table('app', Field('name'), Field('owner', db.auth_user))

 if not session.authorized and MULTI_USER_MODE:
-    if auth.user and not request.function=='user':
+    if auth.user and not request.function == 'user':
        session.authorized = True
-    elif not request.function=='user':
-        redirect(URL('default','user/login'))
+    elif not request.function == 'user':
+        redirect(URL('default', 'user/login'))
+

 def is_manager():
    if not MULTI_USER_MODE:
        return True
-    elif auth.user and (auth.user.id==1 or auth.user.is_manager):
+    elif auth.user and (auth.user.id == 1 or auth.user.is_manager):
        return True
    else:
        return False
-
-
--- a/applications/admin/models/menu.py
+++ b/applications/admin/models/menu.py
@@ -7,31 +7,31 @@ _c = request.controller
 _f = request.function
 response.title = '%s %s' % (_f, '/'.join(request.args))
 response.subtitle = 'admin'
-response.menu = [(T('Site'), _f == 'site', URL(_a,'default','site'))]
+response.menu = [(T('Site'), _f == 'site', URL(_a, 'default', 'site'))]

 if request.vars.app or request.args:
    _t = request.vars.app or request.args[0]
    response.menu.append((T('Edit'), _c == 'default' and _f == 'design',
-                         URL(_a,'default','design',args=_t)))
+                         URL(_a, 'default', 'design', args=_t)))
    response.menu.append((T('About'), _c == 'default' and _f == 'about',
-                         URL(_a,'default','about',args=_t,)))
+                         URL(_a, 'default', 'about', args=_t,)))
    response.menu.append((T('Errors'), _c == 'default' and _f == 'errors',
-                         URL(_a,'default','errors',args=_t)))
+                         URL(_a, 'default', 'errors', args=_t)))
    response.menu.append((T('Versioning'),
                          _c == 'mercurial' and _f == 'commit',
-                          URL(_a,'mercurial','commit',args=_t)))
+                          URL(_a, 'mercurial', 'commit', args=_t)))
+
+if os.path.exists('applications/examples'):
+    response.menu.append(
+        (T('Help'), False, URL('examples', 'default', 'documentation')))
+else:
+    response.menu.append((T('Help'), False, 'http://web2py.com/examples/default/documentation'))

 if not session.authorized:
    response.menu = [(T('Login'), True, URL('site'))]
 else:
    response.menu.append((T('Logout'), False,
-                          URL(_a,'default',f='logout')))
-    response.menu.append((T('Debug'), False, 
-                          URL(_a, 'debug','interact')))
-
-if os.path.exists('applications/examples'):
-    response.menu.append((T('Help'), False, URL('examples','default','index')))
-else:
-    response.menu.append((T('Help'), False, 'http://web2py.com/examples'))
-
+                          URL(_a, 'default', f='logout')))
+    response.menu.append((T('Debug'), False,
+                          URL(_a, 'debug', 'interact')))

--- a/applications/admin/models/plugin_multiselect.py
+++ b/applications/admin/models/plugin_multiselect.py
@@ -1,6 +1,4 @@
-response.files.append(URL('static','plugin_multiselect/jquery.dimensions.js'))
-response.files.append(URL('static','plugin_multiselect/jquery.multiselect.js'))
-response.files.append(URL('static','plugin_multiselect/jquery.multiselect.css'))
-response.files.append(URL('static','plugin_multiselect/start.js'))
-
-
+response.files.append(
+    URL('static', 'plugin_multiselect/jquery.multi-select.js'))
+response.files.append(URL('static', 'plugin_multiselect/multi-select.css'))
+response.files.append(URL('static', 'plugin_multiselect/start.js'))
--- a/applications/admin/modules/init.py
+++ b/applications/admin/modules/init.py
@@ -1,2 +1 @@

-
--- a/applications/admin/static/ace/src/mode-text.js
+++ b/applications/admin/static/ace/src/mode-text.js
--- a/applications/admin/settings.cfg
+++ b/applications/admin/settings.cfg
@@ -0,0 +1,6 @@
+[DEFAULT]
+theme = web2py
+
+[editor]
+theme = web2py
+
--- a/applications/admin/static/ace/ChangeLog.txt
+++ b/applications/admin/static/ace/ChangeLog.txt
@@ -1,116 +0,0 @@
-2011.08.02, Version 0.2.0
-
-* Split view (Julian Viereck)
-  - split editor area horizontally or vertivally to show two files at the same
-    time
-
-* Code Folding (Julian Viereck)
-  - Unstructured code folding
-  - Will be the basis for language aware folding
-
-* Mode behaviours (Chris Spencer)
-  - Adds mode specific hooks which allow transformations of entered text
-  - Autoclosing of braces, paranthesis and quotation marks in C style modes
-  - Autoclosing of angular brackets in XML style modes
-
-* New language modes
-  - Clojure (Carin Meier)
-  - C# (Rob Conery)
-  - Groovy (Ben Tilford)
-  - Scala (Ben Tilford)
-  - JSON
-  - OCaml (Sergi Mansilla)
-  - Perl (Panagiotis Astithas)
-  - SCSS/SASS (Andreas Madsen)
-  - SVG
-  - Textile (Kelley van Evert)
-  - SCAD (Jacob Hansson)
-  
-* Live syntax checks
-  - Lint for Css using CSS Lint <http://csslint.net/>
-  - CoffeeScript
-
-* New Themes
-  - Crimson Editor (iebuggy)
-  - Merbivore (Michael Schwartz)
-  - Merbivore soft (Michael Schwartz)
-  - Solarized dark/light <http://ethanschoonover.com/solarized> (David Alan
-    Hjelle)
-  - Vibrant Ink (Michael Schwartz)
-
-* Small Features/Enhancements
-  - Lots of render performance optimizations (Harutyun Amirjanyan)
-  - Improved Ruby highlighting (Chris Wanstrath, Trent Ogren)
-  - Improved PHP highlighting (Thomas Hruska)
-  - Improved CSS highlighting (Sean Kellogg)
-  - Clicks which cause the editor to be focused don't reset the selection
-  - Make padding text layer specific so that print margin and active line
-    highlight are not affected (Irakli Gozalishvili)
-  - Added setFontSize method
-  - Improved vi keybindings (Trent Ogren)
-  - When unfocused make cursor transparent instead of removing it (Harutyun
-    Amirjanyan)
-  - Support for matching groups in tokenizer with arrays of tokens (Chris
-    Spencer)
-
-* Bug fixes
-  - Add support for the new OSX scroll bars
-  - Properly highlight JavaScript regexp literals
-  - Proper handling of unicode characters in JavaScript identifiers
-  - Fix remove lines command on last line (Harutyun Amirjanyan)
-  - Fix scroll wheel sluggishness in Safari
-  - Make keyboard infrastructure route keys like []^$ the right way (Julian
-    Viereck)
-
-2011.02.14, Version 0.1.6
-
-* Floating Anchors
-  - An Anchor is a floating pointer in the document. 
-  - Whenever text is inserted or deleted before the cursor, the position of
-    the cursor is updated
-  - Usesd for the cursor and selection
-  - Basis for bookmarks, multiple cursors and snippets in the future
-* Extensive support for Cocoa style keybindings on the Mac <https://github.com/ajaxorg/ace/issues/closed#issue/116/comment/767803>
-* New commands:
-  - center selection in viewport
-  - remove to end/start of line
-  - split line
-  - transpose letters
-* Refator markers  
-  - Custom code can be used to render markers
-  - Markers can be in front or behind the text
-  - Markers are now stored in the session (was in the renderer)
-* Lots of IE8 fixes including copy, cut and selections
-* Unit tests can also be run in the browser
-  <https://github.com/ajaxorg/ace/blob/master/lib/ace/test/tests.html>
-* Soft wrap can adapt to the width of the editor (Mike Ratcliffe, Joe Cheng)
-* Add minimal node server server.js to run the Ace demo in Chrome
-* The top level editor.html demo has been renamed to index.html
-* Bug fixes
-  - Fixed gotoLine to consider wrapped lines when calculating where to scroll to (James Allen)
-  - Fixed isues when the editor was scrolled in the web page (Eric Allam)
-  - Highlighting of Python string literals
-  - Syntax rule for PHP comments
-
-2011.02.08, Version 0.1.5
-
-* Add Coffeescript Mode (Satoshi Murakami)
-* Fix word wrap bug (Julian Viereck)
-* Fix packaged version of the Eclipse mode
-* Loading of workers is more robust
-* Fix "click selection"
-* Allow tokizing empty lines (Daniel Krech)
-* Make PageUp/Down behavior more consistent with native OS (Joe Cheng)
-
-2011.02.04, Version 0.1.4
-
-* Add C/C++ mode contributed by Gastón Kleiman
-* Fix exception in key input
-
-2011.02.04, Version 0.1.3
-
-* Let the packaged version play nice with requireJS
-* Add Ruby mode contributed by Shlomo Zalman Heigh
-* Add Java mode contributed by Tom Tasche
-* Fix annotation bug
-* Changing a document added a new empty line at the end
--- a/applications/admin/static/ace/LICENSE
+++ b/applications/admin/static/ace/LICENSE
@@ -1,476 +0,0 @@
-Licensed under the tri-license MPL/LGPL/GPL.
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
--- a/applications/admin/static/ace/Readme.md
+++ b/applications/admin/static/ace/Readme.md
@@ -1,199 +0,0 @@
-Ace (Ajax.org Cloud9 Editor)
-============================
-
-Ace is a standalone code editor written in JavaScript. Our goal is to create a browser based editor that matches and extends the features, usability and performance of existing native editors such as TextMate, Vim or Eclipse. It can be easily embedded in any web page or JavaScript application. Ace is developed as the primary editor for [Cloud9 IDE](http://www.cloud9ide.com/) and the successor of the Mozilla Skywriter (Bespin) Project.
-
-Features
--------
-
-* Syntax highlighting
-* Automatic indent and outdent
-* An optional command line
-* Handles huge documents (100,000 lines and more are no problem)
-* Fully customizable key bindings including VI and Emacs modes
-* Themes (TextMate themes can be imported)
-* Search and replace with regular expressions
-* Highlight matching parentheses
-* Toggle between soft tabs and real tabs
-* Displays hidden characters
-* Drag and drop text using the mouse
-* Line wrapping
-* Unstructured / user code folding
-* Live syntax checker (currently JavaScript/CoffeeScript)
-
-Take Ace for a spin!
--------------------
-
-Check out the Ace live [demo](http://ajaxorg.github.com/ace/) or get a [Cloud9 IDE account](http://run.cloud9ide.com) to experience Ace while editing one of your own GitHub projects.
-
-If you want, you can use Ace as a textarea replacement thanks to the [Ace Bookmarklet](http://ajaxorg.github.com/ace/build/textarea/editor.html).
-
-History
-------
-
-Previously known as “Bespin” and “Skywriter” it’s now known as Ace (Ajax.org Cloud9 Editor)! Bespin and Ace started as two independent projects, both aiming to build a no-compromise code editor component for the web. Bespin started as part of Mozilla Labs and was based on the canvas tag, while Ace is the Editor component of the Cloud9 IDE and is using the DOM for rendering. After the release of Ace at JSConf.eu 2010 in Berlin the Skywriter team decided to merge Ace with a simplified version of Skywriter's plugin system and some of Skywriter's extensibility points. All these changes have been merged back to Ace. Both Ajax.org and Mozilla are actively developing and maintaining Ace.
-
-Getting the code
----------------
-
-Ace is a community project. We actively encourage and support contributions. The Ace source code is hosted on GitHub. It is released under the Mozilla tri-license (MPL/GPL/LGPL), the same license used by Firefox. This license is friendly to all kinds of projects, whether open source or not. Take charge of your editor and add your favorite language highlighting and keybindings!
-
-```bash
-    git clone git://github.com/ajaxorg/ace.git
-    cd ace
-    git submodule update --init --recursive
-```
-
-Embedding Ace
-------------
-
-Ace can be easily embedded into any existing web page. The Ace git repository ships with a pre-packaged version of Ace inside of the `build` directory. The same packaged files are also available as a separate [download](https://github.com/ajaxorg/ace/downloads). Simply copy the contents of the `src` subdirectory somewhere into your project and take a look at the included demos of how to use Ace.
-
-The easiest version is simply:
-
-```html
-    <div id="editor">some text</div>
-    <script src="src/ace.js" type="text/javascript" charset="utf-8"></script>
-    <script>
-    window.onload = function() {
-        var editor = ace.edit("editor");
-    };
-    </script>
-```
-
-With "editor" being the id of the DOM element, which should be converted to an editor. Note that this element must be explicitly sized and positioned `absolute` or `relative` for Ace to work. e.g.
-
-```css
-    #editor {
-        position: absolute;
-        width: 500px;
-        height: 400px;
-    }
-```
-
-To change the theme simply include the Theme's JavaScript file
-
-```html
-    <script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script>
-```
-
-and configure the editor to use the theme:
-
-```javascript
-    editor.setTheme("ace/theme/twilight");
-```
-
-By default the editor only supports plain text mode; many other languages are available as separate modules. After including the mode's JavaScript file:
-
-```html
-    <script src="src/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
-```
-
-Then the mode can be used like this:
-
-```javascript
-    var JavaScriptMode = require("ace/mode/javascript").Mode;
-    editor.getSession().setMode(new JavaScriptMode());
-```
-
-Documentation
-------------
-
-You find a lot more sample code in the [demo app](https://github.com/ajaxorg/ace/blob/master/demo/demo.js).
-
-There is also some documentation on the [wiki page](https://github.com/ajaxorg/ace/wiki).
-
-If you still need help, feel free to drop a mail on the [ace mailing list](http://groups.google.com/group/ace-discuss).
-
-Running Ace
-----------
-
-After the checkout Ace works out of the box. No build step is required. Open 'editor.html' in any browser except Google Chrome. Google Chrome doesn't allow XMLHTTPRequests from files loaded from disc (i.e. with a file:/// URL). To open Ace in Chrome simply start the bundled mini HTTP server:
-
-```bash
-    ./static.py
-```
-
-Or using Node.JS
-
-```bash
-    npm install mime
-    ./static.js
-```
-
-The editor can then be opened at http://localhost:8888/index.html.
-
-Package Ace
-----------
-
-To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. Before you can build you need to make sure that the submodules are up to date.
-
-```bash
-    git submodule update --init --recursive
-```
-
-Make sure you at least version 0.3.0 of dryice
-
-```bash
-    npm install dryice
-```
-
-Afterwards Ace can be built by calling
-
-```bash
-    ./Makefile.dryice.js normal
-```
-
-The packaged Ace will be put in the 'build' folder.
-
-To build the bookmarklet version execute
-
-```bash
-    ./Makefile.dryice.js bm
-```
-
-Running the Unit Tests
----------------------
-
-The Ace unit tests run on node.js. Before the first run a couple of node modules have to be installed. The easiest way to do this is by using the node package manager (npm). In the Ace base directory simply call
-
-```bash
-    npm link .
-```
-
-To run the tests call:
-
-```bash
-    node lib/ace/test/all.js
-```
-
-You can also run the tests in your browser by serving:
-
-    http://localhost:8888/lib/ace/test/tests.html
-
-This makes debugging failing tests way more easier.
-
-Continuous Integration status
-----------------------------
-
-This project is tested with [Travis CI](http://travis-ci.org)
-[![Build Status](https://secure.travis-ci.org/ajaxorg/ace.png)](http://travis-ci.org/ajaxorg/ace)
-
-Contributing
------------
-
-Ace wouldn't be what it is without contributions! Feel free to fork and improve/enhance Ace any way you want. If you feel that the editor or the Ace community will benefit from your changes, please open a pull request. To protect the interests of the Ace contributors and users we require contributors to sign a Contributors License Agreement (CLA) before we pull the changes into the main repository. Our CLA is the simplest of agreements, requiring that the contributions you make to an ajax.org project are only those you're allowed to make. This helps us significantly reduce future legal risk for everyone involved. It is easy, helps everyone, takes ten minutes, and only needs to be completed once.  There are two versions of the agreement:
-
-1. [The Individual CLA](https://github.com/ajaxorg/ace/raw/master/doc/Contributor_License_Agreement-v2.pdf): use this version if you're working on an ajax.org in your spare time, or can clearly claim ownership of copyright in what you'll be submitting.
-2. [The Corporate CLA](https://github.com/ajaxorg/ace/raw/master/doc/Corporate_Contributor_License_Agreement-v2.pdf): have your corporate lawyer review and submit this if your company is going to be contributing to ajax.org  projects
-
-If you want to contribute to an ajax.org project please print the CLA and fill it out and sign it. Then either send it by snail mail or fax to us or send it back scanned (or as a photo) by email.
-
-Email: fabian.jakobs@web.de
-
-Fax: +31 (0) 206388953
-
-Address: Ajax.org B.V.
-  Keizersgracht 241
-  1016 EA, Amsterdam
-  the Netherlands
--- a/applications/admin/static/ace/src/ace-compat.js
+++ b/applications/admin/static/ace/src/ace-compat.js
@@ -1 +0,0 @@
-define("pilot/index",["require","exports","module","pilot/browser_focus","pilot/dom","pilot/event","pilot/event_emitter","pilot/fixoldbrowsers","pilot/keys","pilot/lang","pilot/oop","pilot/useragent","pilot/canon"],function(a,b,c){a("pilot/browser_focus"),a("pilot/dom"),a("pilot/event"),a("pilot/event_emitter"),a("pilot/fixoldbrowsers"),a("pilot/keys"),a("pilot/lang"),a("pilot/oop"),a("pilot/useragent"),a("pilot/canon")}),define("pilot/browser_focus",["require","exports","module","ace/lib/browser_focus"],function(a,b,c){console.warn("DEPRECATED: 'pilot/browser_focus' is deprecated. Use 'ace/lib/browser_focus' instead"),c.exports=a("ace/lib/browser_focus")}),define("pilot/dom",["require","exports","module","ace/lib/dom"],function(a,b,c){console.warn("DEPRECATED: 'pilot/dom' is deprecated. Use 'ace/lib/dom' instead"),c.exports=a("ace/lib/dom")}),define("pilot/event",["require","exports","module","ace/lib/event"],function(a,b,c){console.warn("DEPRECATED: 'pilot/event' is deprecated. Use 'ace/lib/event' instead"),c.exports=a("ace/lib/event")}),define("pilot/event_emitter",["require","exports","module","ace/lib/event_emitter"],function(a,b,c){console.warn("DEPRECATED: 'pilot/event_emitter' is deprecated. Use 'ace/lib/event_emitter' instead"),c.exports=a("ace/lib/event_emitter")}),define("pilot/fixoldbrowsers",["require","exports","module","ace/lib/fixoldbrowsers"],function(a,b,c){console.warn("DEPRECATED: 'pilot/fixoldbrowsers' is deprecated. Use 'ace/lib/fixoldbrowsers' instead"),c.exports=a("ace/lib/fixoldbrowsers")}),define("pilot/keys",["require","exports","module","ace/lib/keys"],function(a,b,c){console.warn("DEPRECATED: 'pilot/keys' is deprecated. Use 'ace/lib/keys' instead"),c.exports=a("ace/lib/keys")}),define("pilot/lang",["require","exports","module","ace/lib/lang"],function(a,b,c){console.warn("DEPRECATED: 'pilot/lang' is deprecated. Use 'ace/lib/lang' instead"),c.exports=a("ace/lib/lang")}),define("pilot/oop",["require","exports","module","ace/lib/oop"],function(a,b,c){console.warn("DEPRECATED: 'pilot/oop' is deprecated. Use 'ace/lib/oop' instead"),c.exports=a("ace/lib/oop")}),define("pilot/useragent",["require","exports","module","ace/lib/useragent"],function(a,b,c){console.warn("DEPRECATED: 'pilot/useragent' is deprecated. Use 'ace/lib/useragent' instead"),c.exports=a("ace/lib/useragent")}),define("pilot/canon",["require","exports","module"],function(a,b,c){console.warn("DEPRECATED: 'pilot/canon' is deprecated."),b.addCommand=function(){console.warn("DEPRECATED: 'canon.addCommand()' is deprecated. Use 'editor.commands.addCommand(command)' instead."),console.trace()},b.removeCommand=function(){console.warn("DEPRECATED: 'canon.removeCommand()' is deprecated. Use 'editor.commands.removeCommand(command)' instead."),console.trace()}})
--- a/applications/admin/static/ace/src/ace.js
+++ b/applications/admin/static/ace/src/ace.js
--- a/applications/admin/static/ace/src/keybinding-emacs.js
+++ b/applications/admin/static/ace/src/keybinding-emacs.js
@@ -1 +0,0 @@
-define("ace/keyboard/keybinding/emacs",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){"use strict";var d=a("../state_handler").StateHandler,e=a("../state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]*))*","(down|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(right|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(up|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(left|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]*))","([^0-9]+)*"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9]*)*","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}"use strict";var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(var b in a)this.$buildBindingsRegex(a[b]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?("key"in a||(a.key=new RegExp("^"+a.regex[1]+"$")),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c,d){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var e=[];b&1&&e.push("ctrl"),b&8&&e.push("command"),b&2&&e.push("option"),b&4&&e.push("shift"),c&&e.push(c);var f=e.join("-"),g=a.buffer+f;b!=2&&(a.buffer=g);var h={bufferToUse:g,symbolicName:f};return d&&(h.keyIdentifier=d.keyIdentifier),h},$find:function(a,b,c,e,f,g){var h={};return this.keymapping[a.state].some(function(i){var j;if(i.key&&!i.key.test(c))return!1;if(i.regex&&!(j=i.regex.exec(b)))return!1;if(i.match&&!i.match(b,e,f,c,g))return!1;if(i.disallowMatches)for(var k=0;k<i.disallowMatches.length;k++)if(!!j[i.disallowMatches[k]])return!1;if(i.exec){h.command=i.exec;if(i.params){var l;h.args={},i.params.forEach(function(a){a.match!=null&&j!=null?l=j[a.match]||a.defaultValue:l=a.defaultValue,a.type==="number"&&(l=parseInt(l)),h.args[a.name]=l})}a.buffer=""}return i.then&&(a.state=i.then,a.buffer=""),h.command==null&&(h.command="null"),d&&console.log("KeyboardStateMapper#find",i),!0}),h.command?h:(a.buffer="",!1)},handleKeyboard:function(a,b,c,e,f){if(b==0||c!=""&&c!=String.fromCharCode(0)){var g=this.$composeBuffer(a,b,c,f),h=g.bufferToUse,i=g.symbolicName,j=g.keyIdentifier;return g=this.$find(a,h,i,b,c,j),d&&console.log("KeyboardStateMapper#match",h,i,g),g}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})
--- a/applications/admin/static/ace/src/keybinding-vim.js
+++ b/applications/admin/static/ace/src/keybinding-vim.js
@@ -1 +0,0 @@
-define("ace/keyboard/keybinding/vim",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){"use strict";var d=a("../state_handler").StateHandler,e=a("../state_handler").matchCharacterOnly,f=function(a,b,c){return{regex:["([0-9]*)",a],exec:b,params:[{name:"times",match:1,type:"number",defaultValue:1}],then:c}},g={start:[{key:"i",then:"insertMode"},{key:"d",then:"deleteMode"},{key:"a",exec:"gotoright",then:"insertMode"},{key:"shift-i",exec:"gotolinestart",then:"insertMode"},{key:"shift-a",exec:"gotolineend",then:"insertMode"},{key:"shift-c",exec:"removetolineend",then:"insertMode"},{key:"shift-r",exec:"overwrite",then:"replaceMode"},f("(k|up)","golineup"),f("(j|down)","golinedown"),f("(l|right)","gotoright"),f("(h|left)","gotoleft"),{key:"shift-g",exec:"gotoend"},f("b","gotowordleft"),f("e","gotowordright"),f("x","del"),f("shift-x","backspace"),f("shift-d","removetolineend"),f("u","undo"),{comment:"Catch some keyboard input to stop it here",match:e}],insertMode:[{key:"esc",then:"start"}],replaceMode:[{key:"esc",exec:"overwrite",then:"start"}],deleteMode:[{key:"d",exec:"removeline",then:"start"}]};b.Vim=new d(g)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}"use strict";var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(var b in a)this.$buildBindingsRegex(a[b]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?("key"in a||(a.key=new RegExp("^"+a.regex[1]+"$")),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c,d){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var e=[];b&1&&e.push("ctrl"),b&8&&e.push("command"),b&2&&e.push("option"),b&4&&e.push("shift"),c&&e.push(c);var f=e.join("-"),g=a.buffer+f;b!=2&&(a.buffer=g);var h={bufferToUse:g,symbolicName:f};return d&&(h.keyIdentifier=d.keyIdentifier),h},$find:function(a,b,c,e,f,g){var h={};return this.keymapping[a.state].some(function(i){var j;if(i.key&&!i.key.test(c))return!1;if(i.regex&&!(j=i.regex.exec(b)))return!1;if(i.match&&!i.match(b,e,f,c,g))return!1;if(i.disallowMatches)for(var k=0;k<i.disallowMatches.length;k++)if(!!j[i.disallowMatches[k]])return!1;if(i.exec){h.command=i.exec;if(i.params){var l;h.args={},i.params.forEach(function(a){a.match!=null&&j!=null?l=j[a.match]||a.defaultValue:l=a.defaultValue,a.type==="number"&&(l=parseInt(l)),h.args[a.name]=l})}a.buffer=""}return i.then&&(a.state=i.then,a.buffer=""),h.command==null&&(h.command="null"),d&&console.log("KeyboardStateMapper#find",i),!0}),h.command?h:(a.buffer="",!1)},handleKeyboard:function(a,b,c,e,f){if(b==0||c!=""&&c!=String.fromCharCode(0)){var g=this.$composeBuffer(a,b,c,f),h=g.bufferToUse,i=g.symbolicName,j=g.keyIdentifier;return g=this.$find(a,h,i,b,c,j),d&&console.log("KeyboardStateMapper#match",h,i,g),g}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})
--- a/applications/admin/static/ace/src/mode-css.js
+++ b/applications/admin/static/ace/src/mode-css.js
--- a/applications/admin/static/ace/src/mode-html.js
+++ b/applications/admin/static/ace/src/mode-html.js
--- a/applications/admin/static/ace/src/mode-javascript.js
+++ b/applications/admin/static/ace/src/mode-javascript.js
--- a/applications/admin/static/ace/src/mode-json.js
+++ b/applications/admin/static/ace/src/mode-json.js
--- a/applications/admin/static/ace/src/mode-python.js
+++ b/applications/admin/static/ace/src/mode-python.js
--- a/applications/admin/static/ace/src/mode-xml.js
+++ b/applications/admin/static/ace/src/mode-xml.js
--- a/applications/admin/static/ace/src/theme-chrome.js
+++ b/applications/admin/static/ace/src/theme-chrome.js
@@ -1 +0,0 @@
-define("ace/theme/chrome",["require","exports","module","ace/lib/dom"],function(a,b,c){b.cssClass="ace-chrome",b.cssText=".ace-chrome .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-chrome .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-chrome .ace_gutter {  width: 50px;  background: #e8e8e8;  color: #333;  overflow : hidden;}.ace-chrome .ace_gutter-layer {  width: 100%;  text-align: right;}.ace-chrome .ace_gutter-layer .ace_gutter-cell {  padding-right: 6px;}.ace-chrome .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-chrome .ace_text-layer {  cursor: text;}.ace-chrome .ace_cursor {  border-left: 2px solid black;}.ace-chrome .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid black;}        .ace-chrome .ace_line .ace_invisible {  color: rgb(191, 191, 191);}.ace-chrome .ace_line .ace_keyword {  color: blue;}.ace-chrome .ace_line .ace_constant.ace_buildin {  color: rgb(88, 72, 246);}.ace-chrome .ace_line .ace_constant.ace_language {  color: rgb(88, 92, 246);}.ace-chrome .ace_line .ace_constant.ace_library {  color: rgb(6, 150, 14);}.ace-chrome .ace_line .ace_invalid {  background-color: rgb(153, 0, 0);  color: white;}.ace-chrome .ace_line .ace_fold {}.ace-chrome .ace_line .ace_support.ace_function {  color: rgb(60, 76, 114);}.ace-chrome .ace_line .ace_support.ace_constant {  color: rgb(6, 150, 14);}.ace-chrome .ace_line .ace_support.ace_type,.ace-chrome .ace_line .ace_support.ace_class {  color: rgb(109, 121, 222);}.ace-chrome .ace_line .ace_keyword.ace_operator {  color: rgb(104, 118, 135);}.ace-chrome .ace_line .ace_string {  color: #1919a6;}.ace-chrome .ace_line .ace_comment {  color: #236e24;}.ace-chrome .ace_line .ace_comment.ace_doc {  color: #236e24;}.ace-chrome .ace_line .ace_comment.ace_doc.ace_tag {  color: #236e24;}.ace-chrome .ace_line .ace_constant.ace_numeric {  color: rgb(0, 0, 205);}.ace-chrome .ace_line .ace_variable {  color: rgb(49, 132, 149);}.ace-chrome .ace_line .ace_xml_pe {  color: rgb(104, 104, 91);}.ace-chrome .ace_entity.ace_name.ace_function {  color: #0000A2;}.ace-chrome .ace_markup.ace_markupine {    text-decoration:underline;}.ace-chrome .ace_markup.ace_heading {  color: rgb(12, 7, 255);}.ace-chrome .ace_markup.ace_list {  color:rgb(185, 6, 144);}.ace-chrome .ace_marker-layer .ace_selection {  background: rgb(181, 213, 255);}.ace-chrome .ace_marker-layer .ace_step {  background: rgb(252, 255, 0);}.ace-chrome .ace_marker-layer .ace_stack {  background: rgb(164, 229, 101);}.ace-chrome .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgb(192, 192, 192);}.ace-chrome .ace_marker-layer .ace_active_line {  background: rgba(0, 0, 0, 0.07);}.ace-chrome .ace_marker-layer .ace_selected_word {  background: rgb(250, 250, 255);  border: 1px solid rgb(200, 200, 250);}.ace-chrome .ace_meta.ace_tag {  color: rgb(147, 15, 128);}.ace-chrome .ace_string.ace_regex {  color: rgb(255, 0, 0)}.ace-chrome .ace_entity.ace_other.ace_attribute-name{  color: #994409;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-clouds.js
+++ b/applications/admin/static/ace/src/theme-clouds.js
@@ -1 +0,0 @@
-define("ace/theme/clouds",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssClass="ace-clouds",b.cssText=".ace-clouds .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-clouds .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-clouds .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-clouds .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-clouds .ace_scroller {  background-color: #FFFFFF;}.ace-clouds .ace_text-layer {  cursor: text;  color: #000000;}.ace-clouds .ace_cursor {  border-left: 2px solid #000000;}.ace-clouds .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #000000;} .ace-clouds .ace_marker-layer .ace_selection {  background: #BDD5FC;}.ace-clouds .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-clouds .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #BFBFBF;}.ace-clouds .ace_marker-layer .ace_active_line {  background: #FFFBD1;}.ace-clouds .ace_marker-layer .ace_selected_word {  border: 1px solid #BDD5FC;}       .ace-clouds .ace_invisible {  color: #BFBFBF;}.ace-clouds .ace_keyword {  color:#AF956F;}.ace-clouds .ace_keyword.ace_operator {  color:#484848;}.ace-clouds .ace_constant.ace_language {  color:#39946A;}.ace-clouds .ace_constant.ace_numeric {  color:#46A609;}.ace-clouds .ace_invalid {  background-color:#FF002A;}.ace-clouds .ace_fold {    background-color: #AF956F;    border-color: #000000;}.ace-clouds .ace_support.ace_function {  color:#C52727;}.ace-clouds .ace_string {  color:#5D90CD;}.ace-clouds .ace_comment {  color:#BCC8BA;}.ace-clouds .ace_entity.ace_other.ace_attribute-name {  color:#606060;}.ace-clouds .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-clouds_midnight.js
+++ b/applications/admin/static/ace/src/theme-clouds_midnight.js
@@ -1 +0,0 @@
-define("ace/theme/clouds_midnight",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-clouds-midnight",b.cssText=".ace-clouds-midnight .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-clouds-midnight .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-clouds-midnight .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-clouds-midnight .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-clouds-midnight .ace_scroller {  background-color: #191919;}.ace-clouds-midnight .ace_text-layer {  cursor: text;  color: #929292;}.ace-clouds-midnight .ace_cursor {  border-left: 2px solid #7DA5DC;}.ace-clouds-midnight .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #7DA5DC;} .ace-clouds-midnight .ace_marker-layer .ace_selection {  background: #000000;}.ace-clouds-midnight .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-clouds-midnight .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #BFBFBF;}.ace-clouds-midnight .ace_marker-layer .ace_active_line {  background: rgba(215, 215, 215, 0.031);}.ace-clouds-midnight .ace_marker-layer .ace_selected_word {  border: 1px solid #000000;}       .ace-clouds-midnight .ace_invisible {  color: #BFBFBF;}.ace-clouds-midnight .ace_keyword {  color:#927C5D;}.ace-clouds-midnight .ace_keyword.ace_operator {  color:#4B4B4B;}.ace-clouds-midnight .ace_constant.ace_language {  color:#39946A;}.ace-clouds-midnight .ace_constant.ace_numeric {  color:#46A609;}.ace-clouds-midnight .ace_invalid {  color:#FFFFFF;background-color:#E92E2E;}.ace-clouds-midnight .ace_fold {    background-color: #927C5D;    border-color: #929292;}.ace-clouds-midnight .ace_support.ace_function {  color:#E92E2E;}.ace-clouds-midnight .ace_string {  color:#5D90CD;}.ace-clouds-midnight .ace_comment {  color:#3C403B;}.ace-clouds-midnight .ace_entity.ace_other.ace_attribute-name {  color:#606060;}.ace-clouds-midnight .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-cobalt.js
+++ b/applications/admin/static/ace/src/theme-cobalt.js
@@ -1 +0,0 @@
-define("ace/theme/cobalt",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-cobalt",b.cssText=".ace-cobalt .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-cobalt .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-cobalt .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-cobalt .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-cobalt .ace_scroller {  background-color: #002240;}.ace-cobalt .ace_text-layer {  cursor: text;  color: #FFFFFF;}.ace-cobalt .ace_cursor {  border-left: 2px solid #FFFFFF;}.ace-cobalt .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #FFFFFF;} .ace-cobalt .ace_marker-layer .ace_selection {  background: rgba(179, 101, 57, 0.75);}.ace-cobalt .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-cobalt .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgba(255, 255, 255, 0.15);}.ace-cobalt .ace_marker-layer .ace_active_line {  background: rgba(0, 0, 0, 0.35);}.ace-cobalt .ace_marker-layer .ace_selected_word {  border: 1px solid rgba(179, 101, 57, 0.75);}       .ace-cobalt .ace_invisible {  color: rgba(255, 255, 255, 0.15);}.ace-cobalt .ace_keyword {  color:#FF9D00;}.ace-cobalt .ace_constant {  color:#FF628C;}.ace-cobalt .ace_invalid {  color:#F8F8F8;background-color:#800F00;}.ace-cobalt .ace_support {  color:#80FFBB;}.ace-cobalt .ace_fold {    background-color: #FF9D00;    border-color: #FFFFFF;}.ace-cobalt .ace_support.ace_function {  color:#FFB054;}.ace-cobalt .ace_string.ace_regexp {  color:#80FFC2;}.ace-cobalt .ace_comment {  font-style:italic;color:#0088FF;}.ace-cobalt .ace_variable {  color:#CCCCCC;}.ace-cobalt .ace_variable.ace_language {  color:#FF80E1;}.ace-cobalt .ace_meta.ace_tag {  color:#9EFFFF;}.ace-cobalt .ace_markup.ace_underline {    text-decoration:underline;}.ace-cobalt .ace_markup.ace_heading {  color:#C8E4FD;background-color:#001221;}.ace-cobalt .ace_markup.ace_list {  background-color:#130D26;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-crimson_editor.js
+++ b/applications/admin/static/ace/src/theme-crimson_editor.js
@@ -1 +0,0 @@
-define("ace/theme/crimson_editor",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssText=".ace-crimson-editor .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-crimson-editor .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-crimson-editor .ace_gutter {  width: 50px;  background: #e8e8e8;  color: #333;  overflow : hidden;}.ace-crimson-editor .ace_gutter-layer {  width: 100%;  text-align: right;}.ace-crimson-editor .ace_gutter-layer .ace_gutter-cell {  padding-right: 6px;}.ace-crimson-editor .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-crimson-editor .ace_text-layer {  cursor: text;  color: rgb(64, 64, 64);}.ace-crimson-editor .ace_cursor {  border-left: 2px solid black;}.ace-crimson-editor .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid black;}.ace-crimson-editor .ace_line .ace_invisible {  color: rgb(191, 191, 191);}.ace-crimson-editor .ace_line .ace_identifier {  color: black;}.ace-crimson-editor .ace_line .ace_keyword {  color: blue;}.ace-crimson-editor .ace_line .ace_constant.ace_buildin {  color: rgb(88, 72, 246);}.ace-crimson-editor .ace_line .ace_constant.ace_language {  color: rgb(255, 156, 0);}.ace-crimson-editor .ace_line .ace_constant.ace_library {  color: rgb(6, 150, 14);}.ace-crimson-editor .ace_line .ace_invalid {  text-decoration: line-through;  color: rgb(224, 0, 0);}.ace-crimson-editor .ace_line .ace_fold {}.ace-crimson-editor .ace_line .ace_support.ace_function {  color: rgb(192, 0, 0);}.ace-crimson-editor .ace_line .ace_support.ace_constant {  color: rgb(6, 150, 14);}.ace-crimson-editor .ace_line .ace_support.ace_type,.ace-crimson-editor .ace_line .ace_support.ace_class {  color: rgb(109, 121, 222);}.ace-crimson-editor .ace_line .ace_keyword.ace_operator {  color: rgb(49, 132, 149);}.ace-crimson-editor .ace_line .ace_string {  color: rgb(128, 0, 128);}.ace-crimson-editor .ace_line .ace_comment {  color: rgb(76, 136, 107);}.ace-crimson-editor .ace_line .ace_comment.ace_doc {  color: rgb(0, 102, 255);}.ace-crimson-editor .ace_line .ace_comment.ace_doc.ace_tag {  color: rgb(128, 159, 191);}.ace-crimson-editor .ace_line .ace_constant.ace_numeric {  color: rgb(0, 0, 64);}.ace-crimson-editor .ace_line .ace_variable {  color: rgb(0, 64, 128);}.ace-crimson-editor .ace_line .ace_xml_pe {  color: rgb(104, 104, 91);}.ace-crimson-editor .ace_marker-layer .ace_selection {  background: rgb(181, 213, 255);}.ace-crimson-editor .ace_marker-layer .ace_step {  background: rgb(252, 255, 0);}.ace-crimson-editor .ace_marker-layer .ace_stack {  background: rgb(164, 229, 101);}.ace-crimson-editor .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgb(192, 192, 192);}.ace-crimson-editor .ace_marker-layer .ace_active_line {  background: rgb(232, 242, 254);}.ace-crimson-editor .ace_meta.ace_tag {  color:rgb(28, 2, 255);}.ace-crimson-editor .ace_marker-layer .ace_selected_word {  background: rgb(250, 250, 255);  border: 1px solid rgb(200, 200, 250);}.ace-crimson-editor .ace_string.ace_regex {  color: rgb(192, 0, 192);}",b.cssClass="ace-crimson-editor";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-dawn.js
+++ b/applications/admin/static/ace/src/theme-dawn.js
@@ -1 +0,0 @@
-define("ace/theme/dawn",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssClass="ace-dawn",b.cssText=".ace-dawn .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-dawn .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-dawn .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-dawn .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-dawn .ace_scroller {  background-color: #F9F9F9;}.ace-dawn .ace_text-layer {  cursor: text;  color: #080808;}.ace-dawn .ace_cursor {  border-left: 2px solid #000000;}.ace-dawn .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #000000;} .ace-dawn .ace_marker-layer .ace_selection {  background: rgba(39, 95, 255, 0.30);}.ace-dawn .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-dawn .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgba(75, 75, 126, 0.50);}.ace-dawn .ace_marker-layer .ace_active_line {  background: rgba(36, 99, 180, 0.12);}.ace-dawn .ace_marker-layer .ace_selected_word {  border: 1px solid rgba(39, 95, 255, 0.30);}       .ace-dawn .ace_invisible {  color: rgba(75, 75, 126, 0.50);}.ace-dawn .ace_keyword {  color:#794938;}.ace-dawn .ace_constant {  color:#811F24;}.ace-dawn .ace_invalid.ace_illegal {  text-decoration:underline;font-style:italic;color:#F8F8F8;background-color:#B52A1D;}.ace-dawn .ace_invalid.ace_deprecated {  text-decoration:underline;font-style:italic;color:#B52A1D;}.ace-dawn .ace_support {  color:#691C97;}.ace-dawn .ace_fold {    background-color: #794938;    border-color: #080808;}.ace-dawn .ace_support.ace_function {  color:#693A17;}.ace-dawn .ace_string {  color:#0B6125;}.ace-dawn .ace_string.ace_regexp {  color:#CF5628;}.ace-dawn .ace_comment {  font-style:italic;color:#5A525F;}.ace-dawn .ace_variable {  color:#234A97;}.ace-dawn .ace_markup.ace_underline {    text-decoration:underline;}.ace-dawn .ace_markup.ace_heading {  color:#19356D;}.ace-dawn .ace_markup.ace_list {  color:#693A17;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-dreamweaver.js
+++ b/applications/admin/static/ace/src/theme-dreamweaver.js
@@ -1 +0,0 @@
-define("ace/theme/dreamweaver",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssClass="ace-tm",b.cssText=".ace-tm .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-tm .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-tm .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-tm .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-tm .ace_fold {    background-color: #00F;}.ace-tm .ace_text-layer {  cursor: text;}.ace-tm .ace_cursor {  border-left: 2px solid black;}.ace-tm .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid black;}        .ace-tm .ace_line .ace_invisible {  color: rgb(191, 191, 191);}.ace-tm .ace_line .ace_keyword {  color: blue;}.ace-tm .ace_line .ace_constant.ace_buildin {  color: rgb(88, 72, 246);}.ace-tm .ace_line .ace_constant.ace_language {  color: rgb(88, 92, 246);}.ace-tm .ace_line .ace_constant.ace_library {  color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_invalid {  background-color: rgb(153, 0, 0);  color: white;}.ace-tm .ace_line .ace_support.ace_function {  color: rgb(60, 76, 114);}.ace-tm .ace_line .ace_support.ace_constant {  color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_support.ace_type,.ace-tm .ace_line .ace_support.ace_class {  color: #009;}.ace-tm .ace_line .ace_support.ace_php_tag {  color: #f00;}.ace-tm .ace_line .ace_keyword.ace_operator {  color: rgb(104, 118, 135);}.ace-tm .ace_line .ace_string {  color: #00F;}.ace-tm .ace_line .ace_comment {  color: rgb(76, 136, 107);}.ace-tm .ace_line .ace_comment.ace_doc {  color: rgb(0, 102, 255);}.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {  color: rgb(128, 159, 191);}.ace-tm .ace_line .ace_constant.ace_numeric {  color: rgb(0, 0, 205);}.ace-tm .ace_line .ace_variable {  color: #06F}.ace-tm .ace_line .ace_xml_pe {  color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {  color: #00F;}.ace-tm .ace_markup.ace_markupine {    text-decoration:underline;}.ace-tm .ace_markup.ace_heading {  color: rgb(12, 7, 255);}.ace-tm .ace_markup.ace_list {  color:rgb(185, 6, 144);}.ace-tm .ace_marker-layer .ace_selection {  background: rgb(181, 213, 255);}.ace-tm .ace_marker-layer .ace_step {  background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {  background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active_line {  background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_marker-layer .ace_selected_word {  background: rgb(250, 250, 255);  border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_meta.ace_tag {  color:#009;}.ace-tm .ace_meta.ace_tag.ace_anchor {  color:#060;}.ace-tm .ace_meta.ace_tag.ace_form {  color:#F90;}.ace-tm .ace_meta.ace_tag.ace_image {  color:#909;}.ace-tm .ace_meta.ace_tag.ace_script {  color:#900;}.ace-tm .ace_meta.ace_tag.ace_style {  color:#909;}.ace-tm .ace_meta.ace_tag.ace_table {  color:#099;}.ace-tm .ace_string.ace_regex {  color: rgb(255, 0, 0)}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-eclipse.js
+++ b/applications/admin/static/ace/src/theme-eclipse.js
@@ -1 +0,0 @@
-define("ace/theme/eclipse",["require","exports","module","ace/lib/dom"],function(a,b,c){"use strict",b.isDark=!1,b.cssText=".ace-eclipse .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-eclipse .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-eclipse .ace_gutter {  background: rgb(227, 227, 227);  border-right: 1px solid rgb(159, 159, 159);  color: rgb(136, 136, 136);}.ace-eclipse .ace_print_margin {  width: 1px;  background: #b1b4ba;}.ace-eclipse .ace_fold {    background-color: rgb(60, 76, 114);}.ace-eclipse .ace_text-layer {  cursor: text;}.ace-eclipse .ace_cursor {  border-left: 1px solid black;}.ace-eclipse .ace_line .ace_keyword, .ace-eclipse .ace_line .ace_variable {  color: rgb(127, 0, 85);}.ace-eclipse .ace_line .ace_constant.ace_buildin {  color: rgb(88, 72, 246);}.ace-eclipse .ace_line .ace_constant.ace_library {  color: rgb(6, 150, 14);}.ace-eclipse .ace_line .ace_function {  color: rgb(60, 76, 114);}.ace-eclipse .ace_line .ace_string {  color: rgb(42, 0, 255);}.ace-eclipse .ace_line .ace_comment {  color: rgb(63, 127, 95);}.ace-eclipse .ace_line .ace_comment.ace_doc {  color: rgb(63, 95, 191);}.ace-eclipse .ace_line .ace_comment.ace_doc.ace_tag {  color: rgb(127, 159, 191);}.ace-eclipse .ace_line .ace_constant.ace_numeric {}.ace-eclipse .ace_line .ace_tag {  color: rgb(63, 127, 127);}.ace-eclipse .ace_line .ace_type {  color: rgb(127, 0, 127);}.ace-eclipse .ace_line .ace_xml_pe {  color: rgb(104, 104, 91);}.ace-eclipse .ace_marker-layer .ace_selection {  background: rgb(181, 213, 255);}.ace-eclipse .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgb(192, 192, 192);}.ace-eclipse .ace_line .ace_meta.ace_tag {  color:rgb(63, 127, 127);}.ace-eclipse .ace_entity.ace_other.ace_attribute-name {  color:rgb(127, 0, 127);}.ace-eclipse .ace_marker-layer .ace_active_line {  background: rgb(232, 242, 254);}",b.cssClass="ace-eclipse";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-idle_fingers.js
+++ b/applications/admin/static/ace/src/theme-idle_fingers.js
@@ -1 +0,0 @@
-define("ace/theme/idle_fingers",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-idle-fingers",b.cssText=".ace-idle-fingers .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-idle-fingers .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-idle-fingers .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-idle-fingers .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-idle-fingers .ace_scroller {  background-color: #323232;}.ace-idle-fingers .ace_text-layer {  cursor: text;  color: #FFFFFF;}.ace-idle-fingers .ace_cursor {  border-left: 2px solid #91FF00;}.ace-idle-fingers .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #91FF00;} .ace-idle-fingers .ace_marker-layer .ace_selection {  background: rgba(90, 100, 126, 0.88);}.ace-idle-fingers .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-idle-fingers .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #404040;}.ace-idle-fingers .ace_marker-layer .ace_active_line {  background: #353637;}.ace-idle-fingers .ace_marker-layer .ace_selected_word {  border: 1px solid rgba(90, 100, 126, 0.88);}       .ace-idle-fingers .ace_invisible {  color: #404040;}.ace-idle-fingers .ace_keyword {  color:#CC7833;}.ace-idle-fingers .ace_constant {  color:#6C99BB;}.ace-idle-fingers .ace_invalid {  color:#FFFFFF;background-color:#FF0000;}.ace-idle-fingers .ace_fold {    background-color: #CC7833;    border-color: #FFFFFF;}.ace-idle-fingers .ace_support.ace_function {  color:#B83426;}.ace-idle-fingers .ace_string {  color:#A5C261;}.ace-idle-fingers .ace_string.ace_regexp {  color:#CCCC33;}.ace-idle-fingers .ace_comment {  font-style:italic;color:#BC9458;}.ace-idle-fingers .ace_meta.ace_tag {  color:#FFE5BB;}.ace-idle-fingers .ace_entity.ace_name {  color:#FFC66D;}.ace-idle-fingers .ace_markup.ace_underline {    text-decoration:underline;}.ace-idle-fingers .ace_collab.ace_user1 {  color:#323232;background-color:#FFF980;   }";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-kr_theme.js
+++ b/applications/admin/static/ace/src/theme-kr_theme.js
@@ -1 +0,0 @@
-define("ace/theme/kr_theme",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-kr-theme",b.cssText=".ace-kr-theme .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-kr-theme .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-kr-theme .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-kr-theme .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-kr-theme .ace_scroller {  background-color: #0B0A09;}.ace-kr-theme .ace_text-layer {  cursor: text;  color: #FCFFE0;}.ace-kr-theme .ace_cursor {  border-left: 2px solid #FF9900;}.ace-kr-theme .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #FF9900;} .ace-kr-theme .ace_marker-layer .ace_selection {  background: rgba(170, 0, 255, 0.45);}.ace-kr-theme .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-kr-theme .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgba(255, 177, 111, 0.32);}.ace-kr-theme .ace_marker-layer .ace_active_line {  background: #38403D;}.ace-kr-theme .ace_marker-layer .ace_selected_word {  border: 1px solid rgba(170, 0, 255, 0.45);}       .ace-kr-theme .ace_invisible {  color: rgba(255, 177, 111, 0.32);}.ace-kr-theme .ace_keyword {  color:#949C8B;}.ace-kr-theme .ace_constant {  color:rgba(210, 117, 24, 0.76);}.ace-kr-theme .ace_invalid {  color:#F8F8F8;background-color:#A41300;}.ace-kr-theme .ace_support {  color:#9FC28A;}.ace-kr-theme .ace_fold {    background-color: #949C8B;    border-color: #FCFFE0;}.ace-kr-theme .ace_support.ace_function {  color:#85873A;}.ace-kr-theme .ace_string.ace_regexp {  color:rgba(125, 255, 192, 0.65);}.ace-kr-theme .ace_comment {  font-style:italic;color:#706D5B;}.ace-kr-theme .ace_variable {  color:#D1A796;}.ace-kr-theme .ace_variable.ace_language {  color:#FF80E1;}.ace-kr-theme .ace_meta.ace_tag {  color:#BABD9C;}.ace-kr-theme .ace_markup.ace_underline {    text-decoration:underline;}.ace-kr-theme .ace_markup.ace_list {  background-color:#0F0040;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-merbivore.js
+++ b/applications/admin/static/ace/src/theme-merbivore.js
@@ -1 +0,0 @@
-define("ace/theme/merbivore",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-merbivore",b.cssText=".ace-merbivore .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-merbivore .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-merbivore .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-merbivore .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-merbivore .ace_scroller {  background-color: #161616;}.ace-merbivore .ace_text-layer {  cursor: text;  color: #E6E1DC;}.ace-merbivore .ace_cursor {  border-left: 2px solid #FFFFFF;}.ace-merbivore .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #FFFFFF;} .ace-merbivore .ace_marker-layer .ace_selection {  background: #454545;}.ace-merbivore .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-merbivore .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #404040;}.ace-merbivore .ace_marker-layer .ace_active_line {  background: #333435;}.ace-merbivore .ace_marker-layer .ace_selected_word {  border: 1px solid #454545;}       .ace-merbivore .ace_invisible {  color: #404040;}.ace-merbivore .ace_keyword {  color:#FC6F09;}.ace-merbivore .ace_constant {  color:#1EDAFB;}.ace-merbivore .ace_constant.ace_language {  color:#FDC251;}.ace-merbivore .ace_constant.ace_library {  color:#8DFF0A;}.ace-merbivore .ace_constant.ace_numeric {  color:#58C554;}.ace-merbivore .ace_invalid {  color:#FFFFFF;background-color:#990000;}.ace-merbivore .ace_fold {    background-color: #FC6F09;    border-color: #E6E1DC;}.ace-merbivore .ace_support.ace_function {  color:#FC6F09;}.ace-merbivore .ace_string {  color:#8DFF0A;}.ace-merbivore .ace_comment {  font-style:italic;color:#AD2EA4;}.ace-merbivore .ace_meta.ace_tag {  color:#FC6F09;}.ace-merbivore .ace_entity.ace_other.ace_attribute-name {  color:#FFFF89;}.ace-merbivore .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-merbivore_soft.js
+++ b/applications/admin/static/ace/src/theme-merbivore_soft.js
@@ -1 +0,0 @@
-define("ace/theme/merbivore_soft",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-merbivore-soft",b.cssText=".ace-merbivore-soft .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-merbivore-soft .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-merbivore-soft .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-merbivore-soft .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-merbivore-soft .ace_scroller {  background-color: #1C1C1C;}.ace-merbivore-soft .ace_text-layer {  cursor: text;  color: #E6E1DC;}.ace-merbivore-soft .ace_cursor {  border-left: 2px solid #FFFFFF;}.ace-merbivore-soft .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #FFFFFF;} .ace-merbivore-soft .ace_marker-layer .ace_selection {  background: #494949;}.ace-merbivore-soft .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-merbivore-soft .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #404040;}.ace-merbivore-soft .ace_marker-layer .ace_active_line {  background: #333435;}.ace-merbivore-soft .ace_marker-layer .ace_selected_word {  border: 1px solid #494949;}       .ace-merbivore-soft .ace_invisible {  color: #404040;}.ace-merbivore-soft .ace_keyword {  color:#FC803A;}.ace-merbivore-soft .ace_constant {  color:#68C1D8;}.ace-merbivore-soft .ace_constant.ace_language {  color:#E1C582;}.ace-merbivore-soft .ace_constant.ace_library {  color:#8EC65F;}.ace-merbivore-soft .ace_constant.ace_numeric {  color:#7FC578;}.ace-merbivore-soft .ace_invalid {  color:#FFFFFF;background-color:#FE3838;}.ace-merbivore-soft .ace_invalid.ace_deprecated {  color:#FFFFFF;background-color:#FE3838;}.ace-merbivore-soft .ace_fold {    background-color: #FC803A;    border-color: #E6E1DC;}.ace-merbivore-soft .ace_string {  color:#8EC65F;}.ace-merbivore-soft .ace_comment {  font-style:italic;color:#AC4BB8;}.ace-merbivore-soft .ace_meta {  font-style:italic;color:#AC4BB8;}.ace-merbivore-soft .ace_meta.ace_tag {  color:#FC803A;}.ace-merbivore-soft .ace_entity.ace_other.ace_attribute-name {  color:#EAF1A3;}.ace-merbivore-soft .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-mono_industrial.js
+++ b/applications/admin/static/ace/src/theme-mono_industrial.js
@@ -1 +0,0 @@
-define("ace/theme/mono_industrial",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-mono-industrial",b.cssText=".ace-mono-industrial .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-mono-industrial .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-mono-industrial .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-mono-industrial .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-mono-industrial .ace_scroller {  background-color: #222C28;}.ace-mono-industrial .ace_text-layer {  cursor: text;  color: #FFFFFF;}.ace-mono-industrial .ace_cursor {  border-left: 2px solid #FFFFFF;}.ace-mono-industrial .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #FFFFFF;} .ace-mono-industrial .ace_marker-layer .ace_selection {  background: rgba(145, 153, 148, 0.40);}.ace-mono-industrial .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-mono-industrial .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgba(102, 108, 104, 0.50);}.ace-mono-industrial .ace_marker-layer .ace_active_line {  background: rgba(12, 13, 12, 0.25);}.ace-mono-industrial .ace_marker-layer .ace_selected_word {  border: 1px solid rgba(145, 153, 148, 0.40);}       .ace-mono-industrial .ace_invisible {  color: rgba(102, 108, 104, 0.50);}.ace-mono-industrial .ace_keyword {  color:#A39E64;}.ace-mono-industrial .ace_keyword.ace_operator {  color:#A8B3AB;}.ace-mono-industrial .ace_constant {  color:#E98800;}.ace-mono-industrial .ace_constant.ace_numeric {  color:#E98800;}.ace-mono-industrial .ace_invalid {  color:#FFFFFF;background-color:rgba(153, 0, 0, 0.68);}.ace-mono-industrial .ace_fold {    background-color: #A8B3AB;    border-color: #FFFFFF;}.ace-mono-industrial .ace_support.ace_function {  color:#588E60;}.ace-mono-industrial .ace_comment {  color:#666C68;background-color:#151C19;}.ace-mono-industrial .ace_variable.ace_language {  color:#648BD2;}.ace-mono-industrial .ace_entity.ace_other.ace_attribute-name {  color:#909993;}.ace-mono-industrial .ace_entity.ace_name {  color:#5778B6;}.ace-mono-industrial .ace_entity.ace_name.ace_function {  color:#A8B3AB;}.ace-mono-industrial .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-monokai.js
+++ b/applications/admin/static/ace/src/theme-monokai.js
@@ -1 +0,0 @@
-define("ace/theme/monokai",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-monokai",b.cssText=".ace-monokai .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-monokai .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-monokai .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-monokai .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-monokai .ace_scroller {  background-color: #272822;}.ace-monokai .ace_text-layer {  cursor: text;  color: #F8F8F2;}.ace-monokai .ace_cursor {  border-left: 2px solid #F8F8F0;}.ace-monokai .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #F8F8F0;} .ace-monokai .ace_marker-layer .ace_selection {  background: #49483E;}.ace-monokai .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-monokai .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #49483E;}.ace-monokai .ace_marker-layer .ace_active_line {  background: #49483E;}.ace-monokai .ace_marker-layer .ace_selected_word {  border: 1px solid #49483E;}       .ace-monokai .ace_invisible {  color: #49483E;}.ace-monokai .ace_keyword {  color:#F92672;}.ace-monokai .ace_constant.ace_language {  color:#AE81FF;}.ace-monokai .ace_constant.ace_numeric {  color:#AE81FF;}.ace-monokai .ace_invalid {  color:#F8F8F0;background-color:#F92672;}.ace-monokai .ace_invalid.ace_deprecated {  color:#F8F8F0;background-color:#AE81FF;}.ace-monokai .ace_fold {    background-color: #A6E22E;    border-color: #F8F8F2;}.ace-monokai .ace_support.ace_function {  color:#66D9EF;}.ace-monokai .ace_string {  color:#E6DB74;}.ace-monokai .ace_comment {  color:#75715E;}.ace-monokai .ace_entity.ace_other.ace_attribute-name {  color:#A6E22E;}.ace-monokai .ace_entity.ace_name.ace_function {  color:#A6E22E;}.ace-monokai .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-pastel_on_dark.js
+++ b/applications/admin/static/ace/src/theme-pastel_on_dark.js
@@ -1 +0,0 @@
-define("ace/theme/pastel_on_dark",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-pastel-on-dark",b.cssText=".ace-pastel-on-dark .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-pastel-on-dark .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-pastel-on-dark .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-pastel-on-dark .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-pastel-on-dark .ace_scroller {  background-color: #2C2828;}.ace-pastel-on-dark .ace_text-layer {  cursor: text;  color: #8F938F;}.ace-pastel-on-dark .ace_cursor {  border-left: 2px solid #A7A7A7;}.ace-pastel-on-dark .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #A7A7A7;} .ace-pastel-on-dark .ace_marker-layer .ace_selection {  background: rgba(221, 240, 255, 0.20);}.ace-pastel-on-dark .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-pastel-on-dark .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgba(255, 255, 255, 0.25);}.ace-pastel-on-dark .ace_marker-layer .ace_active_line {  background: rgba(255, 255, 255, 0.031);}.ace-pastel-on-dark .ace_marker-layer .ace_selected_word {  border: 1px solid rgba(221, 240, 255, 0.20);}       .ace-pastel-on-dark .ace_invisible {  color: rgba(255, 255, 255, 0.25);}.ace-pastel-on-dark .ace_keyword {  color:#757aD8;}.ace-pastel-on-dark .ace_keyword.ace_operator {  color:#797878;}.ace-pastel-on-dark .ace_constant {  color:#4FB7C5;}.ace-pastel-on-dark .ace_constant.ace_language {  color:#DE8E30;}.ace-pastel-on-dark .ace_constant.ace_numeric {  color:#CCCCCC;}.ace-pastel-on-dark .ace_invalid {  color:#F8F8F8;background-color:rgba(86, 45, 86, 0.75);}.ace-pastel-on-dark .ace_invalid.ace_illegal {  color:#F8F8F8;background-color:rgba(86, 45, 86, 0.75);}.ace-pastel-on-dark .ace_invalid.ace_deprecated {  text-decoration:underline;font-style:italic;color:#D2A8A1;}.ace-pastel-on-dark .ace_fold {    background-color: #757aD8;    border-color: #8F938F;}.ace-pastel-on-dark .ace_support.ace_function {  color:#AEB2F8;}.ace-pastel-on-dark .ace_string {  color:#66A968;}.ace-pastel-on-dark .ace_string.ace_regexp {  color:#E9C062;}.ace-pastel-on-dark .ace_comment {  color:#A6C6FF;}.ace-pastel-on-dark .ace_variable {  color:#BEBF55;}.ace-pastel-on-dark .ace_variable.ace_language {  color:#C1C144;}.ace-pastel-on-dark .ace_xml_pe {  color:#494949;}.ace-pastel-on-dark .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-solarized_dark.js
+++ b/applications/admin/static/ace/src/theme-solarized_dark.js
@@ -1 +0,0 @@
-define("ace/theme/solarized_dark",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-solarized-dark",b.cssText=".ace-solarized-dark .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-solarized-dark .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-solarized-dark .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-solarized-dark .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-solarized-dark .ace_scroller {  background-color: #002B36;}.ace-solarized-dark .ace_text-layer {  cursor: text;  color: #93A1A1;}.ace-solarized-dark .ace_cursor {  border-left: 2px solid #D30102;}.ace-solarized-dark .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #D30102;} .ace-solarized-dark .ace_marker-layer .ace_selection {  background: #073642;}.ace-solarized-dark .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-solarized-dark .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgba(147, 161, 161, 0.50);}.ace-solarized-dark .ace_marker-layer .ace_active_line {  background: #073642;}.ace-solarized-dark .ace_marker-layer .ace_selected_word {  border: 1px solid #073642;}       .ace-solarized-dark .ace_invisible {  color: rgba(147, 161, 161, 0.50);}.ace-solarized-dark .ace_keyword {  color:#859900;}.ace-solarized-dark .ace_constant.ace_language {  color:#B58900;}.ace-solarized-dark .ace_constant.ace_numeric {  color:#D33682;}.ace-solarized-dark .ace_fold {    background-color: #268BD2;    border-color: #93A1A1;}.ace-solarized-dark .ace_support.ace_function {  color:#268BD2;}.ace-solarized-dark .ace_string {  color:#2AA198;}.ace-solarized-dark .ace_string.ace_regexp {  color:#D30102;}.ace-solarized-dark .ace_comment {  font-style:italic;color:#657B83;}.ace-solarized-dark .ace_variable.ace_language {  color:#268BD2;}.ace-solarized-dark .ace_entity.ace_other.ace_attribute-name {  color:#93A1A1;}.ace-solarized-dark .ace_entity.ace_name.ace_function {  color:#268BD2;}.ace-solarized-dark .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-solarized_light.js
+++ b/applications/admin/static/ace/src/theme-solarized_light.js
@@ -1 +0,0 @@
-define("ace/theme/solarized_light",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssClass="ace-solarized-light",b.cssText=".ace-solarized-light .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-solarized-light .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-solarized-light .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-solarized-light .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-solarized-light .ace_scroller {  background-color: #FDF6E3;}.ace-solarized-light .ace_text-layer {  cursor: text;  color: #586E75;}.ace-solarized-light .ace_cursor {  border-left: 2px solid #000000;}.ace-solarized-light .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #000000;} .ace-solarized-light .ace_marker-layer .ace_selection {  background: #073642;}.ace-solarized-light .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-solarized-light .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgba(147, 161, 161, 0.50);}.ace-solarized-light .ace_marker-layer .ace_active_line {  background: #EEE8D5;}.ace-solarized-light .ace_marker-layer .ace_selected_word {  border: 1px solid #073642;}       .ace-solarized-light .ace_invisible {  color: rgba(147, 161, 161, 0.50);}.ace-solarized-light .ace_keyword {  color:#859900;}.ace-solarized-light .ace_constant.ace_language {  color:#B58900;}.ace-solarized-light .ace_constant.ace_numeric {  color:#D33682;}.ace-solarized-light .ace_fold {    background-color: #268BD2;    border-color: #586E75;}.ace-solarized-light .ace_support.ace_function {  color:#268BD2;}.ace-solarized-light .ace_string {  color:#2AA198;}.ace-solarized-light .ace_string.ace_regexp {  color:#D30102;}.ace-solarized-light .ace_comment {  color:#93A1A1;}.ace-solarized-light .ace_variable.ace_language {  color:#268BD2;}.ace-solarized-light .ace_entity.ace_other.ace_attribute-name {  color:#93A1A1;}.ace-solarized-light .ace_entity.ace_name.ace_function {  color:#268BD2;}.ace-solarized-light .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-textmate.js
+++ b/applications/admin/static/ace/src/theme-textmate.js
--- a/applications/admin/static/ace/src/theme-tomorrow.js
+++ b/applications/admin/static/ace/src/theme-tomorrow.js
@@ -1 +0,0 @@
-define("ace/theme/tomorrow",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssClass="ace-tomorrow",b.cssText=".ace-tomorrow .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-tomorrow .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-tomorrow .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-tomorrow .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-tomorrow .ace_scroller {  background-color: #FFFFFF;}.ace-tomorrow .ace_text-layer {  cursor: text;  color: #4D4D4C;}.ace-tomorrow .ace_cursor {  border-left: 2px solid #AEAFAD;}.ace-tomorrow .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #AEAFAD;} .ace-tomorrow .ace_marker-layer .ace_selection {  background: #D6D6D6;}.ace-tomorrow .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-tomorrow .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #D1D1D1;}.ace-tomorrow .ace_marker-layer .ace_active_line {  background: #EFEFEF;}.ace-tomorrow .ace_marker-layer .ace_selected_word {  border: 1px solid #D6D6D6;}       .ace-tomorrow .ace_invisible {  color: #D1D1D1;}.ace-tomorrow .ace_keyword {  color:#8959A8;}.ace-tomorrow .ace_keyword.ace_operator {  color:#3E999F;}.ace-tomorrow .ace_constant.ace_language {  color:#F5871F;}.ace-tomorrow .ace_constant.ace_numeric {  color:#F5871F;}.ace-tomorrow .ace_invalid {  color:#FFFFFF;background-color:#C82829;}.ace-tomorrow .ace_invalid.ace_deprecated {  color:#FFFFFF;background-color:#8959A8;}.ace-tomorrow .ace_fold {    background-color: #4271AE;    border-color: #4D4D4C;}.ace-tomorrow .ace_support.ace_function {  color:#4271AE;}.ace-tomorrow .ace_string {  color:#718C00;}.ace-tomorrow .ace_string.ace_regexp {  color:#C82829;}.ace-tomorrow .ace_comment {  color:#8E908C;}.ace-tomorrow .ace_variable {  color:#C82829;}.ace-tomorrow .ace_meta.ace_tag {  color:#C82829;}.ace-tomorrow .ace_entity.ace_other.ace_attribute-name {  color:#C82829;}.ace-tomorrow .ace_entity.ace_name.ace_function {  color:#4271AE;}.ace-tomorrow .ace_markup.ace_underline {    text-decoration:underline;}.ace-tomorrow .ace_markup.ace_heading {  color:#718C00;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-tomorrow_night.js
+++ b/applications/admin/static/ace/src/theme-tomorrow_night.js
@@ -1 +0,0 @@
-define("ace/theme/tomorrow_night",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-tomorrow-night",b.cssText=".ace-tomorrow-night .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-tomorrow-night .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-tomorrow-night .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-tomorrow-night .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-tomorrow-night .ace_scroller {  background-color: #1D1F21;}.ace-tomorrow-night .ace_text-layer {  cursor: text;  color: #C5C8C6;}.ace-tomorrow-night .ace_cursor {  border-left: 2px solid #AEAFAD;}.ace-tomorrow-night .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #AEAFAD;} .ace-tomorrow-night .ace_marker-layer .ace_selection {  background: #373B41;}.ace-tomorrow-night .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-tomorrow-night .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #4B4E55;}.ace-tomorrow-night .ace_marker-layer .ace_active_line {  background: #282A2E;}.ace-tomorrow-night .ace_marker-layer .ace_selected_word {  border: 1px solid #373B41;}       .ace-tomorrow-night .ace_invisible {  color: #4B4E55;}.ace-tomorrow-night .ace_keyword {  color:#B294BB;}.ace-tomorrow-night .ace_keyword.ace_operator {  color:#8ABEB7;}.ace-tomorrow-night .ace_constant.ace_language {  color:#DE935F;}.ace-tomorrow-night .ace_constant.ace_numeric {  color:#DE935F;}.ace-tomorrow-night .ace_invalid {  color:#CED2CF;background-color:#DF5F5F;}.ace-tomorrow-night .ace_invalid.ace_deprecated {  color:#CED2CF;background-color:#B798BF;}.ace-tomorrow-night .ace_fold {    background-color: #81A2BE;    border-color: #C5C8C6;}.ace-tomorrow-night .ace_support.ace_function {  color:#81A2BE;}.ace-tomorrow-night .ace_string {  color:#B5BD68;}.ace-tomorrow-night .ace_string.ace_regexp {  color:#CC6666;}.ace-tomorrow-night .ace_comment {  color:#969896;}.ace-tomorrow-night .ace_variable {  color:#CC6666;}.ace-tomorrow-night .ace_meta.ace_tag {  color:#CC6666;}.ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name {  color:#CC6666;}.ace-tomorrow-night .ace_entity.ace_name.ace_function {  color:#81A2BE;}.ace-tomorrow-night .ace_markup.ace_underline {    text-decoration:underline;}.ace-tomorrow-night .ace_markup.ace_heading {  color:#B5BD68;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-tomorrow_night_blue.js
+++ b/applications/admin/static/ace/src/theme-tomorrow_night_blue.js
@@ -1 +0,0 @@
-define("ace/theme/tomorrow_night_blue",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-tomorrow-night-blue",b.cssText=".ace-tomorrow-night-blue .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-tomorrow-night-blue .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-tomorrow-night-blue .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-tomorrow-night-blue .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-tomorrow-night-blue .ace_scroller {  background-color: #002451;}.ace-tomorrow-night-blue .ace_text-layer {  cursor: text;  color: #FFFFFF;}.ace-tomorrow-night-blue .ace_cursor {  border-left: 2px solid #FFFFFF;}.ace-tomorrow-night-blue .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #FFFFFF;} .ace-tomorrow-night-blue .ace_marker-layer .ace_selection {  background: #003F8E;}.ace-tomorrow-night-blue .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-tomorrow-night-blue .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #404F7D;}.ace-tomorrow-night-blue .ace_marker-layer .ace_active_line {  background: #00346E;}.ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word {  border: 1px solid #003F8E;}       .ace-tomorrow-night-blue .ace_invisible {  color: #404F7D;}.ace-tomorrow-night-blue .ace_keyword {  color:#EBBBFF;}.ace-tomorrow-night-blue .ace_keyword.ace_operator {  color:#99FFFF;}.ace-tomorrow-night-blue .ace_constant.ace_language {  color:#FFC58F;}.ace-tomorrow-night-blue .ace_constant.ace_numeric {  color:#FFC58F;}.ace-tomorrow-night-blue .ace_invalid {  color:#FFFFFF;background-color:#F99DA5;}.ace-tomorrow-night-blue .ace_invalid.ace_deprecated {  color:#FFFFFF;background-color:#EBBBFF;}.ace-tomorrow-night-blue .ace_fold {    background-color: #BBDAFF;    border-color: #FFFFFF;}.ace-tomorrow-night-blue .ace_support.ace_function {  color:#BBDAFF;}.ace-tomorrow-night-blue .ace_string {  color:#D1F1A9;}.ace-tomorrow-night-blue .ace_string.ace_regexp {  color:#FF9DA4;}.ace-tomorrow-night-blue .ace_comment {  color:#7285B7;}.ace-tomorrow-night-blue .ace_variable {  color:#FF9DA4;}.ace-tomorrow-night-blue .ace_meta.ace_tag {  color:#FF9DA4;}.ace-tomorrow-night-blue .ace_entity.ace_other.ace_attribute-name {  color:#FF9DA4;}.ace-tomorrow-night-blue .ace_entity.ace_name.ace_function {  color:#BBDAFF;}.ace-tomorrow-night-blue .ace_markup.ace_underline {    text-decoration:underline;}.ace-tomorrow-night-blue .ace_markup.ace_heading {  color:#D1F1A9;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-tomorrow_night_bright.js
+++ b/applications/admin/static/ace/src/theme-tomorrow_night_bright.js
@@ -1 +0,0 @@
-define("ace/theme/tomorrow_night_bright",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-tomorrow-night-bright",b.cssText=".ace-tomorrow-night-bright .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-tomorrow-night-bright .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-tomorrow-night-bright .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-tomorrow-night-bright .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-tomorrow-night-bright .ace_scroller {  background-color: #000000;}.ace-tomorrow-night-bright .ace_text-layer {  cursor: text;  color: #DEDEDE;}.ace-tomorrow-night-bright .ace_cursor {  border-left: 2px solid #9F9F9F;}.ace-tomorrow-night-bright .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #9F9F9F;} .ace-tomorrow-night-bright .ace_marker-layer .ace_selection {  background: #424242;}.ace-tomorrow-night-bright .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-tomorrow-night-bright .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #343434;}.ace-tomorrow-night-bright .ace_marker-layer .ace_active_line {  background: #2A2A2A;}.ace-tomorrow-night-bright .ace_marker-layer .ace_selected_word {  border: 1px solid #424242;}       .ace-tomorrow-night-bright .ace_invisible {  color: #343434;}.ace-tomorrow-night-bright .ace_keyword {  color:#C397D8;}.ace-tomorrow-night-bright .ace_keyword.ace_operator {  color:#70C0B1;}.ace-tomorrow-night-bright .ace_constant.ace_language {  color:#E78C45;}.ace-tomorrow-night-bright .ace_constant.ace_numeric {  color:#E78C45;}.ace-tomorrow-night-bright .ace_invalid {  color:#CED2CF;background-color:#DF5F5F;}.ace-tomorrow-night-bright .ace_invalid.ace_deprecated {  color:#CED2CF;background-color:#B798BF;}.ace-tomorrow-night-bright .ace_fold {    background-color: #7AA6DA;    border-color: #DEDEDE;}.ace-tomorrow-night-bright .ace_support.ace_function {  color:#7AA6DA;}.ace-tomorrow-night-bright .ace_string {  color:#B9CA4A;}.ace-tomorrow-night-bright .ace_string.ace_regexp {  color:#D54E53;}.ace-tomorrow-night-bright .ace_comment {  color:#969896;}.ace-tomorrow-night-bright .ace_variable {  color:#D54E53;}.ace-tomorrow-night-bright .ace_meta.ace_tag {  color:#D54E53;}.ace-tomorrow-night-bright .ace_entity.ace_other.ace_attribute-name {  color:#D54E53;}.ace-tomorrow-night-bright .ace_entity.ace_name.ace_function {  color:#7AA6DA;}.ace-tomorrow-night-bright .ace_markup.ace_underline {    text-decoration:underline;}.ace-tomorrow-night-bright .ace_markup.ace_heading {  color:#B9CA4A;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-tomorrow_night_eighties.js
+++ b/applications/admin/static/ace/src/theme-tomorrow_night_eighties.js
@@ -1 +0,0 @@
-define("ace/theme/tomorrow_night_eighties",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-tomorrow-night-eighties",b.cssText=".ace-tomorrow-night-eighties .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-tomorrow-night-eighties .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-tomorrow-night-eighties .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-tomorrow-night-eighties .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-tomorrow-night-eighties .ace_scroller {  background-color: #2D2D2D;}.ace-tomorrow-night-eighties .ace_text-layer {  cursor: text;  color: #CCCCCC;}.ace-tomorrow-night-eighties .ace_cursor {  border-left: 2px solid #CCCCCC;}.ace-tomorrow-night-eighties .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #CCCCCC;} .ace-tomorrow-night-eighties .ace_marker-layer .ace_selection {  background: #515151;}.ace-tomorrow-night-eighties .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-tomorrow-night-eighties .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #6A6A6A;}.ace-tomorrow-night-eighties .ace_marker-layer .ace_active_line {  background: #393939;}.ace-tomorrow-night-eighties .ace_marker-layer .ace_selected_word {  border: 1px solid #515151;}       .ace-tomorrow-night-eighties .ace_invisible {  color: #6A6A6A;}.ace-tomorrow-night-eighties .ace_keyword {  color:#CC99CC;}.ace-tomorrow-night-eighties .ace_keyword.ace_operator {  color:#66CCCC;}.ace-tomorrow-night-eighties .ace_constant.ace_language {  color:#F99157;}.ace-tomorrow-night-eighties .ace_constant.ace_numeric {  color:#F99157;}.ace-tomorrow-night-eighties .ace_invalid {  color:#CDCDCD;background-color:#F2777A;}.ace-tomorrow-night-eighties .ace_invalid.ace_deprecated {  color:#CDCDCD;background-color:#CC99CC;}.ace-tomorrow-night-eighties .ace_fold {    background-color: #6699CC;    border-color: #CCCCCC;}.ace-tomorrow-night-eighties .ace_support.ace_function {  color:#6699CC;}.ace-tomorrow-night-eighties .ace_string {  color:#99CC99;}.ace-tomorrow-night-eighties .ace_comment {  color:#999999;}.ace-tomorrow-night-eighties .ace_variable {  color:#F2777A;}.ace-tomorrow-night-eighties .ace_meta.ace_tag {  color:#F2777A;}.ace-tomorrow-night-eighties .ace_entity.ace_other.ace_attribute-name {  color:#F2777A;}.ace-tomorrow-night-eighties .ace_entity.ace_name.ace_function {  color:#6699CC;}.ace-tomorrow-night-eighties .ace_markup.ace_underline {    text-decoration:underline;}.ace-tomorrow-night-eighties .ace_markup.ace_heading {  color:#99CC99;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-twilight.js
+++ b/applications/admin/static/ace/src/theme-twilight.js
@@ -1 +0,0 @@
-define("ace/theme/twilight",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-twilight",b.cssText=".ace-twilight .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-twilight .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-twilight .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-twilight .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-twilight .ace_scroller {  background-color: #141414;}.ace-twilight .ace_text-layer {  cursor: text;  color: #F8F8F8;}.ace-twilight .ace_cursor {  border-left: 2px solid #A7A7A7;}.ace-twilight .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #A7A7A7;} .ace-twilight .ace_marker-layer .ace_selection {  background: rgba(221, 240, 255, 0.20);}.ace-twilight .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-twilight .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgba(255, 255, 255, 0.25);}.ace-twilight .ace_marker-layer .ace_active_line {  background: rgba(255, 255, 255, 0.031);}.ace-twilight .ace_marker-layer .ace_selected_word {  border: 1px solid rgba(221, 240, 255, 0.20);}       .ace-twilight .ace_invisible {  color: rgba(255, 255, 255, 0.25);}.ace-twilight .ace_keyword {  color:#CDA869;}.ace-twilight .ace_constant {  color:#CF6A4C;}.ace-twilight .ace_invalid.ace_illegal {  color:#F8F8F8;background-color:rgba(86, 45, 86, 0.75);}.ace-twilight .ace_invalid.ace_deprecated {  text-decoration:underline;font-style:italic;color:#D2A8A1;}.ace-twilight .ace_support {  color:#9B859D;}.ace-twilight .ace_fold {    background-color: #AC885B;    border-color: #F8F8F8;}.ace-twilight .ace_support.ace_function {  color:#DAD085;}.ace-twilight .ace_string {  color:#8F9D6A;}.ace-twilight .ace_string.ace_regexp {  color:#E9C062;}.ace-twilight .ace_comment {  font-style:italic;color:#5F5A60;}.ace-twilight .ace_variable {  color:#7587A6;}.ace-twilight .ace_xml_pe {  color:#494949;}.ace-twilight .ace_meta.ace_tag {  color:#AC885B;}.ace-twilight .ace_entity.ace_name.ace_function {  color:#AC885B;}.ace-twilight .ace_markup.ace_underline {    text-decoration:underline;}.ace-twilight .ace_markup.ace_heading {  color:#CF6A4C;}.ace-twilight .ace_markup.ace_list {  color:#F9EE98;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/ace/src/theme-vibrant_ink.js
+++ b/applications/admin/static/ace/src/theme-vibrant_ink.js
@@ -1 +0,0 @@
-define("ace/theme/vibrant_ink",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-vibrant-ink",b.cssText=".ace-vibrant-ink .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-vibrant-ink .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-vibrant-ink .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-vibrant-ink .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-vibrant-ink .ace_scroller {  background-color: #0F0F0F;}.ace-vibrant-ink .ace_text-layer {  cursor: text;  color: #FFFFFF;}.ace-vibrant-ink .ace_cursor {  border-left: 2px solid #FFFFFF;}.ace-vibrant-ink .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #FFFFFF;} .ace-vibrant-ink .ace_marker-layer .ace_selection {  background: #6699CC;}.ace-vibrant-ink .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-vibrant-ink .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #404040;}.ace-vibrant-ink .ace_marker-layer .ace_active_line {  background: #333333;}.ace-vibrant-ink .ace_marker-layer .ace_selected_word {  border: 1px solid #6699CC;}       .ace-vibrant-ink .ace_invisible {  color: #404040;}.ace-vibrant-ink .ace_keyword {  color:#FF6600;}.ace-vibrant-ink .ace_constant {  color:#339999;}.ace-vibrant-ink .ace_constant.ace_numeric {  color:#99CC99;}.ace-vibrant-ink .ace_invalid {  color:#CCFF33;background-color:#000000;}.ace-vibrant-ink .ace_invalid.ace_deprecated {  color:#CCFF33;background-color:#000000;}.ace-vibrant-ink .ace_fold {    background-color: #FFCC00;    border-color: #FFFFFF;}.ace-vibrant-ink .ace_support.ace_function {  color:#FFCC00;}.ace-vibrant-ink .ace_string {  color:#66FF00;}.ace-vibrant-ink .ace_string.ace_regexp {  color:#44B4CC;}.ace-vibrant-ink .ace_comment {  color:#9933CC;}.ace-vibrant-ink .ace_entity.ace_other.ace_attribute-name {  font-style:italic;color:#99CC99;}.ace-vibrant-ink .ace_entity.ace_name.ace_function {  color:#FFCC00;}.ace-vibrant-ink .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
--- a/applications/admin/static/codemirror/CONTRIBUTING.md
+++ b/applications/admin/static/codemirror/CONTRIBUTING.md
@@ -0,0 +1,72 @@
+# 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
@@ -0,0 +1,19 @@
+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
@@ -0,0 +1,11 @@
+# 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
@@ -0,0 +1,145 @@
+(function() {
+  "use strict";
+
+  var noOptions = {};
+  var nonWS = /[^\s\u00a0]/;
+  var Pos = CodeMirror.Pos;
+
+  function firstNonWS(str) {
+    var found = str.search(nonWS);
+    return found == -1 ? 0 : found;
+  }
+
+  CodeMirror.commands.toggleComment = function(cm) {
+    var from = cm.getCursor("start"), to = cm.getCursor("end");
+    cm.uncomment(from, to) || cm.lineComment(from, to);
+  };
+
+  CodeMirror.defineExtension("lineComment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = self.getModeAt(from);
+    var commentString = options.lineComment || mode.lineComment;
+    if (!commentString) {
+      if (options.blockCommentStart || mode.blockCommentStart) {
+        options.fullLines = true;
+        self.blockComment(from, to, options);
+      }
+      return;
+    }
+    var firstLine = self.getLine(from.line);
+    if (firstLine == null) return;
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
+    var pad = options.padding == null ? " " : options.padding;
+    var blankLines = options.commentBlankLines || from.line == to.line;
+
+    self.operation(function() {
+      if (options.indent) {
+        var baseString = firstLine.slice(0, firstNonWS(firstLine));
+        for (var i = from.line; i < end; ++i) {
+          var line = self.getLine(i), cut = baseString.length;
+          if (!blankLines && !nonWS.test(line)) continue;
+          if (line.slice(0, cut) != baseString) cut = firstNonWS(line);
+          self.replaceRange(baseString + commentString + pad, Pos(i, 0), Pos(i, cut));
+        }
+      } else {
+        for (var i = from.line; i < end; ++i) {
+          if (blankLines || nonWS.test(self.getLine(i)))
+            self.replaceRange(commentString + pad, Pos(i, 0));
+        }
+      }
+    });
+  });
+
+  CodeMirror.defineExtension("blockComment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = self.getModeAt(from);
+    var startString = options.blockCommentStart || mode.blockCommentStart;
+    var endString = options.blockCommentEnd || mode.blockCommentEnd;
+    if (!startString || !endString) {
+      if ((options.lineComment || mode.lineComment) && options.fullLines != false)
+        self.lineComment(from, to, options);
+      return;
+    }
+
+    var end = Math.min(to.line, self.lastLine());
+    if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
+
+    var pad = options.padding == null ? " " : options.padding;
+    if (from.line > end) return;
+
+    self.operation(function() {
+      if (options.fullLines != false) {
+        var lastLineHasText = nonWS.test(self.getLine(end));
+        self.replaceRange(pad + endString, Pos(end));
+        self.replaceRange(startString + pad, Pos(from.line, 0));
+        var lead = options.blockCommentLead || mode.blockCommentLead;
+        if (lead != null) for (var i = from.line + 1; i <= end; ++i)
+          if (i != end || lastLineHasText)
+            self.replaceRange(lead + pad, Pos(i, 0));
+      } else {
+        self.replaceRange(endString, to);
+        self.replaceRange(startString, from);
+      }
+    });
+  });
+
+  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);
+
+    // Try finding line comments
+    var lineString = options.lineComment || mode.lineComment, lines = [];
+    var pad = options.padding == null ? " " : options.padding, didSomething;
+    lineComment: {
+      if (!lineString) break lineComment;
+      for (var i = start; i <= end; ++i) {
+        var line = self.getLine(i);
+        var found = line.indexOf(lineString);
+        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;
+        lines.push(line);
+      }
+      self.operation(function() {
+        for (var i = start; i <= end; ++i) {
+          var line = lines[i - start];
+          var pos = line.indexOf(lineString), endPos = pos + lineString.length;
+          if (pos < 0) continue;
+          if (line.slice(endPos, endPos + pad.length) == pad) endPos += pad.length;
+          didSomething = true;
+          self.replaceRange("", Pos(i, pos), Pos(i, endPos));
+        }
+      });
+      if (didSomething) return true;
+    }
+
+    // Try block comments
+    var startString = options.blockCommentStart || mode.blockCommentStart;
+    var endString = options.blockCommentEnd || mode.blockCommentEnd;
+    if (!startString || !endString) return false;
+    var lead = options.blockCommentLead || mode.blockCommentLead;
+    var startLine = self.getLine(start), endLine = end == start ? startLine : self.getLine(end);
+    var open = startLine.indexOf(startString), close = endLine.lastIndexOf(endString);
+    if (close == -1 && start != end) {
+      endLine = self.getLine(--end);
+      close = endLine.lastIndexOf(endString);
+    }
+    if (open == -1 || close == -1) return false;
+
+    self.operation(function() {
+      self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
+                        Pos(end, close + endString.length));
+      var openEnd = open + startString.length;
+      if (pad && startLine.slice(openEnd, openEnd + pad.length) == pad) openEnd += pad.length;
+      self.replaceRange("", Pos(start, open), Pos(start, openEnd));
+      if (lead) for (var i = start + 1; i <= end; ++i) {
+        var line = self.getLine(i), found = line.indexOf(lead);
+        if (found == -1 || nonWS.test(line.slice(0, found))) continue;
+        var foundEnd = found + lead.length;
+        if (pad && line.slice(foundEnd, foundEnd + pad.length) == pad) foundEnd += pad.length;
+        self.replaceRange("", Pos(i, found), Pos(i, foundEnd));
+      }
+    });
+    return true;
+  });
+})();
--- a/applications/admin/static/codemirror/addon/dialog/dialog.css
+++ b/applications/admin/static/codemirror/addon/dialog/dialog.css
@@ -0,0 +1,32 @@
+.CodeMirror-dialog {
+  position: absolute;
+  left: 0; right: 0;
+  background: white;
+  z-index: 15;
+  padding: .1em .8em;
+  overflow: hidden;
+  color: #333;
+}
+
+.CodeMirror-dialog-top {
+  border-bottom: 1px solid #eee;
+  top: 0;
+}
+
+.CodeMirror-dialog-bottom {
+  border-top: 1px solid #eee;
+  bottom: 0;
+}
+
+.CodeMirror-dialog input {
+  border: none;
+  outline: none;
+  background: transparent;
+  width: 20em;
+  color: inherit;
+  font-family: monospace;
+}
+
+.CodeMirror-dialog button {
+  font-size: 70%;
+}
--- a/applications/admin/static/codemirror/addon/dialog/dialog.js
+++ b/applications/admin/static/codemirror/addon/dialog/dialog.js
@@ -0,0 +1,80 @@
+// Open simple dialogs on top of an editor. Relies on dialog.css.
+
+(function() {
+  function dialogDiv(cm, template, bottom) {
+    var wrap = cm.getWrapperElement();
+    var dialog;
+    dialog = wrap.appendChild(document.createElement("div"));
+    if (bottom) {
+      dialog.className = "CodeMirror-dialog CodeMirror-dialog-bottom";
+    } else {
+      dialog.className = "CodeMirror-dialog CodeMirror-dialog-top";
+    }
+    dialog.innerHTML = template;
+    return dialog;
+  }
+
+  CodeMirror.defineExtension("openDialog", function(template, callback, options) {
+    var dialog = dialogDiv(this, template, options && options.bottom);
+    var closed = false, me = this;
+    function close() {
+      if (closed) return;
+      closed = true;
+      dialog.parentNode.removeChild(dialog);
+    }
+    var inp = dialog.getElementsByTagName("input")[0], button;
+    if (inp) {
+      CodeMirror.on(inp, "keydown", function(e) {
+        if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
+        if (e.keyCode == 13 || e.keyCode == 27) {
+          CodeMirror.e_stop(e);
+          close();
+          me.focus();
+          if (e.keyCode == 13) callback(inp.value);
+        }
+      });
+      if (options && options.onKeyUp) {
+        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
+      }
+      if (options && options.value) inp.value = options.value;
+      inp.focus();
+      CodeMirror.on(inp, "blur", close);
+    } else if (button = dialog.getElementsByTagName("button")[0]) {
+      CodeMirror.on(button, "click", function() {
+        close();
+        me.focus();
+      });
+      button.focus();
+      CodeMirror.on(button, "blur", close);
+    }
+    return close;
+  });
+
+  CodeMirror.defineExtension("openConfirm", function(template, callbacks, options) {
+    var dialog = dialogDiv(this, template, options && options.bottom);
+    var buttons = dialog.getElementsByTagName("button");
+    var closed = false, me = this, blurring = 1;
+    function close() {
+      if (closed) return;
+      closed = true;
+      dialog.parentNode.removeChild(dialog);
+      me.focus();
+    }
+    buttons[0].focus();
+    for (var i = 0; i < buttons.length; ++i) {
+      var b = buttons[i];
+      (function(callback) {
+        CodeMirror.on(b, "click", function(e) {
+          CodeMirror.e_preventDefault(e);
+          close();
+          if (callback) callback(me);
+        });
+      })(callbacks[i]);
+      CodeMirror.on(b, "blur", function() {
+        --blurring;
+        setTimeout(function() { if (blurring <= 0) close(); }, 200);
+      });
+      CodeMirror.on(b, "focus", function() { ++blurring; });
+    }
+  });
+})();
--- a/applications/admin/static/codemirror/addon/display/fullscreen.css
+++ b/applications/admin/static/codemirror/addon/display/fullscreen.css
@@ -0,0 +1,6 @@
+.CodeMirror-fullscreen {
+  position: fixed;
+  top: 0; left: 0; right: 0; bottom: 0;
+  height: auto;
+  z-index: 9;
+}
--- a/applications/admin/static/codemirror/addon/display/fullscreen.js
+++ b/applications/admin/static/codemirror/addon/display/fullscreen.js
@@ -0,0 +1,30 @@
+(function() {
+  "use strict";
+
+  CodeMirror.defineOption("fullScreen", false, function(cm, val, old) {
+    if (old == CodeMirror.Init) old = false;
+    if (!old == !val) return;
+    if (val) setFullscreen(cm);
+    else setNormal(cm);
+  });
+
+  function setFullscreen(cm) {
+    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.className += " CodeMirror-fullscreen";
+    document.documentElement.style.overflow = "hidden";
+    cm.refresh();
+  }
+
+  function setNormal(cm) {
+    var wrap = cm.getWrapperElement();
+    wrap.className = wrap.className.replace(/\s*CodeMirror-fullscreen\b/, "");
+    document.documentElement.style.overflow = "";
+    var info = cm.state.fullScreenRestore;
+    wrap.style.width = info.width; wrap.style.height = info.height;
+    window.scrollTo(info.scrollLeft, info.scrollTop);
+    cm.refresh();
+  }
+})();
--- a/applications/admin/static/codemirror/addon/display/placeholder.js
+++ b/applications/admin/static/codemirror/addon/display/placeholder.js
@@ -0,0 +1,54 @@
+(function() {
+  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);
+      var wrapper = cm.getWrapperElement();
+      wrapper.className = wrapper.className.replace(" CodeMirror-empty", "");
+    }
+
+    if (val && !cm.hasFocus()) onBlur(cm);
+  });
+
+  function clearPlaceholder(cm) {
+    if (cm.state.placeholder) {
+      cm.state.placeholder.parentNode.removeChild(cm.state.placeholder);
+      cm.state.placeholder = null;
+    }
+  }
+  function setPlaceholder(cm) {
+    clearPlaceholder(cm);
+    var elt = cm.state.placeholder = document.createElement("pre");
+    elt.style.cssText = "height: 0; overflow: visible";
+    elt.className = "CodeMirror-placeholder";
+    elt.appendChild(document.createTextNode(cm.getOption("placeholder")));
+    cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
+  }
+
+  function onFocus(cm) {
+    clearPlaceholder(cm);
+  }
+  function onBlur(cm) {
+    if (isEmpty(cm)) setPlaceholder(cm);
+  }
+  function onChange(cm) {
+    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);
+  }
+
+  function isEmpty(cm) {
+    return (cm.lineCount() === 1) && (cm.getLine(0) === "");
+  }
+})();
--- a/applications/admin/static/codemirror/addon/edit/closebrackets.js
+++ b/applications/admin/static/codemirror/addon/edit/closebrackets.js
@@ -0,0 +1,82 @@
+(function() {
+  var DEFAULT_BRACKETS = "()[]{}''\"\"";
+  var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
+  var SPACE_CHAR_REGEX = /\s/;
+
+  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;
+    if (typeof val == "string") pairs = val;
+    else if (typeof val == "object") {
+      if (val.pairs != null) pairs = val.pairs;
+      if (val.explode != null) explode = val.explode;
+    }
+    var map = buildKeymap(pairs);
+    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));
+    return str.length == 2 ? str : null;
+  }
+
+  function buildKeymap(pairs) {
+    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;
+      }
+    };
+    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");
+      }
+      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 (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;
+      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);
+      });
+    };
+  }
+})();
--- a/applications/admin/static/codemirror/addon/edit/closetag.js
+++ b/applications/admin/static/codemirror/addon/edit/closetag.js
@@ -0,0 +1,87 @@
+/**
+ * Tag-closer extension for CodeMirror.
+ *
+ * This extension adds an "autoCloseTags" option that can be set to
+ * either true to get the default behavior, or an object to further
+ * configure its behavior.
+ *
+ * These are supported options:
+ *
+ * `whenClosing` (default true)
+ *   Whether to autoclose when the '/' of a closing tag is typed.
+ * `whenOpening` (default true)
+ *   Whether to autoclose the tag when the final '>' of an opening
+ *   tag is typed.
+ * `dontCloseTags` (default is empty tags for HTML, none for XML)
+ *   An array of tag names that should not be autoclosed.
+ * `indentTags` (default is block tags for HTML, none for XML)
+ *   An array of tag names that should, when opened, cause a
+ *   blank line to be added inside the tag, and the blank line and
+ *   closing line to be indented.
+ *
+ * See demos/closetag.html for a usage example.
+ */
+
+(function() {
+  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)) {
+      cm.removeKeyMap("autoCloseTags");
+    }
+  });
+
+  var htmlDontClose = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param",
+                       "source", "track", "wbr"];
+  var htmlIndent = ["applet", "blockquote", "body", "button", "div", "dl", "fieldset", "form", "frameset", "h1", "h2", "h3", "h4",
+                    "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;
+
+    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 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);
+    }
+  }
+
+  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 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;
+  }
+})();
--- a/applications/admin/static/codemirror/addon/edit/continuelist.js
+++ b/applications/admin/static/codemirror/addon/edit/continuelist.js
@@ -0,0 +1,25 @@
+(function() {
+  'use strict';
+
+  var listRE = /^(\s*)([*+-]|(\d+)\.)(\s*)/,
+      unorderedBullets = '*+-';
+
+  CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
+    var pos = cm.getCursor(),
+        inList = cm.getStateAfter(pos.line).list,
+        match;
+
+    if (!inList || !(match = cm.getLine(pos.line).match(listRE))) {
+      cm.execCommand('newlineAndIndent');
+      return;
+    }
+
+    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');
+  };
+
+}());
--- a/applications/admin/static/codemirror/addon/edit/matchbrackets.js
+++ b/applications/admin/static/codemirror/addon/edit/matchbrackets.js
@@ -0,0 +1,86 @@
+(function() {
+  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;
+    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 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 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};
+        }
+      }
+    }
+    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};
+  }
+
+  function matchBrackets(cm, autoclear) {
+    // 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 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;
+  }
+
+  var currentlyHighlighted = null;
+  function doMatchBrackets(cm) {
+    cm.operation(function() {
+      if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
+      if (!cm.somethingSelected()) currentlyHighlighted = matchBrackets(cm, false);
+    });
+  }
+
+  CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init)
+      cm.off("cursorActivity", doMatchBrackets);
+    if (val) {
+      cm.state.matchBrackets = typeof val == "object" ? val : {};
+      cm.on("cursorActivity", doMatchBrackets);
+    }
+  });
+
+  CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict){
+    return findMatchingBracket(this, pos, strict);
+  });
+})();
--- a/applications/admin/static/codemirror/addon/edit/trailingspace.js
+++ b/applications/admin/static/codemirror/addon/edit/trailingspace.js
@@ -0,0 +1,15 @@
+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
@@ -0,0 +1,93 @@
+CodeMirror.registerHelper("fold", "brace", function(cm, start) {
+  var line = start.line, lineText = cm.getLine(line);
+  var startCh, tokenType;
+
+  function findOpening(openCh) {
+    for (var at = start.ch, pass = 0;;) {
+      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
+      if (found == -1) {
+        if (pass == 1) break;
+        pass = 1;
+        at = lineText.length;
+        continue;
+      }
+      if (pass == 1 && found < start.ch) break;
+      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
+      if (!/^(comment|string)/.test(tokenType)) return found + 1;
+      at = found - 1;
+    }
+  }
+
+  var startToken = "{", endToken = "}", startCh = findOpening("{");
+  if (startCh == null) {
+    startToken = "[", endToken = "]";
+    startCh = findOpening("[");
+  }
+
+  if (startCh == null) return;
+  var count = 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 (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
+        if (pos == nextOpen) ++count;
+        else if (!--count) { 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)};
+});
+CodeMirror.braceRangeFinder = CodeMirror.fold.brace; // deprecated
+
+CodeMirror.registerHelper("fold", "import", function(cm, start) {
+  function hasImport(line) {
+    if (line < cm.firstLine() || line > cm.lastLine()) return null;
+    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
+    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
+    if (start.type != "keyword" || start.string != "import") return null;
+    // Now find closing semicolon, return its position
+    for (var i = line, e = Math.min(cm.lastLine(), line + 10); i <= e; ++i) {
+      var text = cm.getLine(i), semi = text.indexOf(";");
+      if (semi != -1) return {startCh: start.end, end: CodeMirror.Pos(i, semi)};
+    }
+  }
+
+  var start = start.line, has = hasImport(start), prev;
+  if (!has || hasImport(start - 1) || ((prev = hasImport(start - 2)) && prev.end.line == start - 1))
+    return null;
+  for (var end = has.end;;) {
+    var next = hasImport(end.line + 1);
+    if (next == null) break;
+    end = next.end;
+  }
+  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) {
+    if (line < cm.firstLine() || line > cm.lastLine()) return null;
+    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
+    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
+    if (start.type == "meta" && start.string.slice(0, 8) == "#include") return start.start + 8;
+  }
+
+  var start = start.line, has = hasInclude(start);
+  if (has == null || hasInclude(start - 1) != null) return null;
+  for (var end = start;;) {
+    var next = hasInclude(end + 1);
+    if (next == null) break;
+    ++end;
+  }
+  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/foldcode.js
+++ b/applications/admin/static/codemirror/addon/fold/foldcode.js
@@ -0,0 +1,73 @@
+(function() {
+  "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;
+    if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
+    var minSize = options && options.minFoldSize || 0;
+
+    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 (!allowFolded) return null;
+          range.cleared = true;
+          marks[i].clear();
+        }
+      }
+      return range;
+    }
+
+    var range = getRange(true);
+    if (options && options.scanUp) while (!range && pos.line > cm.firstLine()) {
+      pos = CodeMirror.Pos(pos.line - 1, 0);
+      range = getRange(false);
+    }
+    if (!range || range.cleared) return;
+
+    var myWidget = makeWidget(options);
+    CodeMirror.on(myWidget, "mousedown", function() { myRange.clear(); });
+    var myRange = cm.markText(range.from, range.to, {
+      replacedWith: myWidget,
+      clearOnEnter: true,
+      __isFold: true
+    });
+    myRange.on("clear", function(from, to) {
+      CodeMirror.signal(cm, "unfold", cm, from, to);
+    });
+    CodeMirror.signal(cm, "fold", cm, range.from, range.to);
+  }
+
+  function makeWidget(options) {
+    var widget = (options && options.widget) || "\u2194";
+    if (typeof widget == "string") {
+      var text = document.createTextNode(widget);
+      widget = document.createElement("span");
+      widget.appendChild(text);
+      widget.className = "CodeMirror-foldmarker";
+    }
+    return widget;
+  }
+
+  // Clumsy backwards-compatible interface
+  CodeMirror.newFoldFunction = function(rangeFinder, widget) {
+    return function(cm, pos) { doFold(cm, pos, {rangeFinder: rangeFinder, widget: widget}); };
+  };
+
+  // New-style interface
+  CodeMirror.defineExtension("foldCode", function(pos, options) { doFold(this, pos, options); });
+
+  CodeMirror.registerHelper("fold", "combine", function() {
+    var funcs = Array.prototype.slice.call(arguments, 0);
+    return function(cm, start) {
+      for (var i = 0; i < funcs.length; ++i) {
+        var found = funcs[i](cm, start);
+        if (found) return found;
+      }
+    };
+  });
+})();
--- a/applications/admin/static/codemirror/addon/fold/indent-fold.js
+++ b/applications/admin/static/codemirror/addon/fold/indent-fold.js
@@ -0,0 +1,12 @@
+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) {
+    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)};
+  }
+});
+CodeMirror.indentRangeFinder = CodeMirror.fold.indent; // deprecated
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				define("pilot/index",["require","exports","module","pilot/browser_focus","pilot/dom","pilot/event","pilot/event_emitter","pilot/fixoldbrowsers","pilot/keys","pilot/lang","pilot/oop","pilot/useragent","pilot/canon"],function(a,b,c){a("pilot/browser_focus"),a("pilot/dom"),a("pilot/event"),a("pilot/event_emitter"),a("pilot/fixoldbrowsers"),a("pilot/keys"),a("pilot/lang"),a("pilot/oop"),a("pilot/useragent"),a("pilot/canon")}),define("pilot/browser_focus",["require","exports","module","ace/lib/browser_focus"],function(a,b,c){console.warn("DEPRECATED: 'pilot/browser_focus' is deprecated. Use 'ace/lib/browser_focus' instead"),c.exports=a("ace/lib/browser_focus")}),define("pilot/dom",["require","exports","module","ace/lib/dom"],function(a,b,c){console.warn("DEPRECATED: 'pilot/dom' is deprecated. Use 'ace/lib/dom' instead"),c.exports=a("ace/lib/dom")}),define("pilot/event",["require","exports","module","ace/lib/event"],function(a,b,c){console.warn("DEPRECATED: 'pilot/event' is deprecated. Use 'ace/lib/event' instead"),c.exports=a("ace/lib/event")}),define("pilot/event_emitter",["require","exports","module","ace/lib/event_emitter"],function(a,b,c){console.warn("DEPRECATED: 'pilot/event_emitter' is deprecated. Use 'ace/lib/event_emitter' instead"),c.exports=a("ace/lib/event_emitter")}),define("pilot/fixoldbrowsers",["require","exports","module","ace/lib/fixoldbrowsers"],function(a,b,c){console.warn("DEPRECATED: 'pilot/fixoldbrowsers' is deprecated. Use 'ace/lib/fixoldbrowsers' instead"),c.exports=a("ace/lib/fixoldbrowsers")}),define("pilot/keys",["require","exports","module","ace/lib/keys"],function(a,b,c){console.warn("DEPRECATED: 'pilot/keys' is deprecated. Use 'ace/lib/keys' instead"),c.exports=a("ace/lib/keys")}),define("pilot/lang",["require","exports","module","ace/lib/lang"],function(a,b,c){console.warn("DEPRECATED: 'pilot/lang' is deprecated. Use 'ace/lib/lang' instead"),c.exports=a("ace/lib/lang")}),define("pilot/oop",["require","exports","module","ace/lib/oop"],function(a,b,c){console.warn("DEPRECATED: 'pilot/oop' is deprecated. Use 'ace/lib/oop' instead"),c.exports=a("ace/lib/oop")}),define("pilot/useragent",["require","exports","module","ace/lib/useragent"],function(a,b,c){console.warn("DEPRECATED: 'pilot/useragent' is deprecated. Use 'ace/lib/useragent' instead"),c.exports=a("ace/lib/useragent")}),define("pilot/canon",["require","exports","module"],function(a,b,c){console.warn("DEPRECATED: 'pilot/canon' is deprecated."),b.addCommand=function(){console.warn("DEPRECATED: 'canon.addCommand()' is deprecated. Use 'editor.commands.addCommand(command)' instead."),console.trace()},b.removeCommand=function(){console.warn("DEPRECATED: 'canon.removeCommand()' is deprecated. Use 'editor.commands.removeCommand(command)' instead."),console.trace()}})
				`@@ -1 +0,0 @@`
				define("ace/keyboard/keybinding/emacs",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){"use strict";var d=a("../state_handler").StateHandler,e=a("../state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]))","(down\|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]))","(right\|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]))","(up\|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]))","(left\|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]))","([^0-9]+)"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9])","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]\|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}"use strict";var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(var b in a)this.$buildBindingsRegex(a[b]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?("key"in a\|\|(a.key=new RegExp("^"+a.regex[1]+"$")),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c,d){if(a.state==null\|\|a.buffer==null)a.state="start",a.buffer="";var e=[];b&1&&e.push("ctrl"),b&8&&e.push("command"),b&2&&e.push("option"),b&4&&e.push("shift"),c&&e.push(c);var f=e.join("-"),g=a.buffer+f;b!=2&&(a.buffer=g);var h={bufferToUse:g,symbolicName:f};return d&&(h.keyIdentifier=d.keyIdentifier),h},$find:function(a,b,c,e,f,g){var h={};return this.keymapping[a.state].some(function(i){var j;if(i.key&&!i.key.test(c))return!1;if(i.regex&&!(j=i.regex.exec(b)))return!1;if(i.match&&!i.match(b,e,f,c,g))return!1;if(i.disallowMatches)for(var k=0;k<i.disallowMatches.length;k++)if(!!j[i.disallowMatches[k]])return!1;if(i.exec){h.command=i.exec;if(i.params){var l;h.args={},i.params.forEach(function(a){a.match!=null&&j!=null?l=j[a.match]\|\|a.defaultValue:l=a.defaultValue,a.type==="number"&&(l=parseInt(l)),h.args[a.name]=l})}a.buffer=""}return i.then&&(a.state=i.then,a.buffer=""),h.command==null&&(h.command="null"),d&&console.log("KeyboardStateMapper#find",i),!0}),h.command?h:(a.buffer="",!1)},handleKeyboard:function(a,b,c,e,f){if(b==0\|\|c!=""&&c!=String.fromCharCode(0)){var g=this.$composeBuffer(a,b,c,f),h=g.bufferToUse,i=g.symbolicName,j=g.keyIdentifier;return g=this.$find(a,h,i,b,c,j),d&&console.log("KeyboardStateMapper#match",h,i,g),g}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})
				`@@ -1 +0,0 @@`
				define("ace/keyboard/keybinding/vim",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){"use strict";var d=a("../state_handler").StateHandler,e=a("../state_handler").matchCharacterOnly,f=function(a,b,c){return{regex:["([0-9]*)",a],exec:b,params:[{name:"times",match:1,type:"number",defaultValue:1}],then:c}},g={start:[{key:"i",then:"insertMode"},{key:"d",then:"deleteMode"},{key:"a",exec:"gotoright",then:"insertMode"},{key:"shift-i",exec:"gotolinestart",then:"insertMode"},{key:"shift-a",exec:"gotolineend",then:"insertMode"},{key:"shift-c",exec:"removetolineend",then:"insertMode"},{key:"shift-r",exec:"overwrite",then:"replaceMode"},f("(k\|up)","golineup"),f("(j\|down)","golinedown"),f("(l\|right)","gotoright"),f("(h\|left)","gotoleft"),{key:"shift-g",exec:"gotoend"},f("b","gotowordleft"),f("e","gotowordright"),f("x","del"),f("shift-x","backspace"),f("shift-d","removetolineend"),f("u","undo"),{comment:"Catch some keyboard input to stop it here",match:e}],insertMode:[{key:"esc",then:"start"}],replaceMode:[{key:"esc",exec:"overwrite",then:"start"}],deleteMode:[{key:"d",exec:"removeline",then:"start"}]};b.Vim=new d(g)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}"use strict";var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(var b in a)this.$buildBindingsRegex(a[b]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?("key"in a\|\|(a.key=new RegExp("^"+a.regex[1]+"$")),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c,d){if(a.state==null\|\|a.buffer==null)a.state="start",a.buffer="";var e=[];b&1&&e.push("ctrl"),b&8&&e.push("command"),b&2&&e.push("option"),b&4&&e.push("shift"),c&&e.push(c);var f=e.join("-"),g=a.buffer+f;b!=2&&(a.buffer=g);var h={bufferToUse:g,symbolicName:f};return d&&(h.keyIdentifier=d.keyIdentifier),h},$find:function(a,b,c,e,f,g){var h={};return this.keymapping[a.state].some(function(i){var j;if(i.key&&!i.key.test(c))return!1;if(i.regex&&!(j=i.regex.exec(b)))return!1;if(i.match&&!i.match(b,e,f,c,g))return!1;if(i.disallowMatches)for(var k=0;k<i.disallowMatches.length;k++)if(!!j[i.disallowMatches[k]])return!1;if(i.exec){h.command=i.exec;if(i.params){var l;h.args={},i.params.forEach(function(a){a.match!=null&&j!=null?l=j[a.match]\|\|a.defaultValue:l=a.defaultValue,a.type==="number"&&(l=parseInt(l)),h.args[a.name]=l})}a.buffer=""}return i.then&&(a.state=i.then,a.buffer=""),h.command==null&&(h.command="null"),d&&console.log("KeyboardStateMapper#find",i),!0}),h.command?h:(a.buffer="",!1)},handleKeyboard:function(a,b,c,e,f){if(b==0\|\|c!=""&&c!=String.fromCharCode(0)){var g=this.$composeBuffer(a,b,c,f),h=g.bufferToUse,i=g.symbolicName,j=g.keyIdentifier;return g=this.$find(a,h,i,b,c,j),d&&console.log("KeyboardStateMapper#match",h,i,g),g}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})
				`@@ -1 +0,0 @@`
				define("ace/theme/chrome",["require","exports","module","ace/lib/dom"],function(a,b,c){b.cssClass="ace-chrome",b.cssText=".ace-chrome .ace_editor { border: 2px solid rgb(159, 159, 159);}.ace-chrome .ace_editor.ace_focus { border: 2px solid #327fbd;}.ace-chrome .ace_gutter { width: 50px; background: #e8e8e8; color: #333; overflow : hidden;}.ace-chrome .ace_gutter-layer { width: 100%; text-align: right;}.ace-chrome .ace_gutter-layer .ace_gutter-cell { padding-right: 6px;}.ace-chrome .ace_print_margin { width: 1px; background: #e8e8e8;}.ace-chrome .ace_text-layer { cursor: text;}.ace-chrome .ace_cursor { border-left: 2px solid black;}.ace-chrome .ace_cursor.ace_overwrite { border-left: 0px; border-bottom: 1px solid black;} .ace-chrome .ace_line .ace_invisible { color: rgb(191, 191, 191);}.ace-chrome .ace_line .ace_keyword { color: blue;}.ace-chrome .ace_line .ace_constant.ace_buildin { color: rgb(88, 72, 246);}.ace-chrome .ace_line .ace_constant.ace_language { color: rgb(88, 92, 246);}.ace-chrome .ace_line .ace_constant.ace_library { color: rgb(6, 150, 14);}.ace-chrome .ace_line .ace_invalid { background-color: rgb(153, 0, 0); color: white;}.ace-chrome .ace_line .ace_fold {}.ace-chrome .ace_line .ace_support.ace_function { color: rgb(60, 76, 114);}.ace-chrome .ace_line .ace_support.ace_constant { color: rgb(6, 150, 14);}.ace-chrome .ace_line .ace_support.ace_type,.ace-chrome .ace_line .ace_support.ace_class { color: rgb(109, 121, 222);}.ace-chrome .ace_line .ace_keyword.ace_operator { color: rgb(104, 118, 135);}.ace-chrome .ace_line .ace_string { color: #1919a6;}.ace-chrome .ace_line .ace_comment { color: #236e24;}.ace-chrome .ace_line .ace_comment.ace_doc { color: #236e24;}.ace-chrome .ace_line .ace_comment.ace_doc.ace_tag { color: #236e24;}.ace-chrome .ace_line .ace_constant.ace_numeric { color: rgb(0, 0, 205);}.ace-chrome .ace_line .ace_variable { color: rgb(49, 132, 149);}.ace-chrome .ace_line .ace_xml_pe { color: rgb(104, 104, 91);}.ace-chrome .ace_entity.ace_name.ace_function { color: #0000A2;}.ace-chrome .ace_markup.ace_markupine { text-decoration:underline;}.ace-chrome .ace_markup.ace_heading { color: rgb(12, 7, 255);}.ace-chrome .ace_markup.ace_list { color:rgb(185, 6, 144);}.ace-chrome .ace_marker-layer .ace_selection { background: rgb(181, 213, 255);}.ace-chrome .ace_marker-layer .ace_step { background: rgb(252, 255, 0);}.ace-chrome .ace_marker-layer .ace_stack { background: rgb(164, 229, 101);}.ace-chrome .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; border: 1px solid rgb(192, 192, 192);}.ace-chrome .ace_marker-layer .ace_active_line { background: rgba(0, 0, 0, 0.07);}.ace-chrome .ace_marker-layer .ace_selected_word { background: rgb(250, 250, 255); border: 1px solid rgb(200, 200, 250);}.ace-chrome .ace_meta.ace_tag { color: rgb(147, 15, 128);}.ace-chrome .ace_string.ace_regex { color: rgb(255, 0, 0)}.ace-chrome .ace_entity.ace_other.ace_attribute-name{ color: #994409;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
				`@@ -1 +0,0 @@`
				define("ace/theme/clouds",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssClass="ace-clouds",b.cssText=".ace-clouds .ace_editor { border: 2px solid rgb(159, 159, 159);}.ace-clouds .ace_editor.ace_focus { border: 2px solid #327fbd;}.ace-clouds .ace_gutter { background: #e8e8e8; color: #333;}.ace-clouds .ace_print_margin { width: 1px; background: #e8e8e8;}.ace-clouds .ace_scroller { background-color: #FFFFFF;}.ace-clouds .ace_text-layer { cursor: text; color: #000000;}.ace-clouds .ace_cursor { border-left: 2px solid #000000;}.ace-clouds .ace_cursor.ace_overwrite { border-left: 0px; border-bottom: 1px solid #000000;} .ace-clouds .ace_marker-layer .ace_selection { background: #BDD5FC;}.ace-clouds .ace_marker-layer .ace_step { background: rgb(198, 219, 174);}.ace-clouds .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; border: 1px solid #BFBFBF;}.ace-clouds .ace_marker-layer .ace_active_line { background: #FFFBD1;}.ace-clouds .ace_marker-layer .ace_selected_word { border: 1px solid #BDD5FC;} .ace-clouds .ace_invisible { color: #BFBFBF;}.ace-clouds .ace_keyword { color:#AF956F;}.ace-clouds .ace_keyword.ace_operator { color:#484848;}.ace-clouds .ace_constant.ace_language { color:#39946A;}.ace-clouds .ace_constant.ace_numeric { color:#46A609;}.ace-clouds .ace_invalid { background-color:#FF002A;}.ace-clouds .ace_fold { background-color: #AF956F; border-color: #000000;}.ace-clouds .ace_support.ace_function { color:#C52727;}.ace-clouds .ace_string { color:#5D90CD;}.ace-clouds .ace_comment { color:#BCC8BA;}.ace-clouds .ace_entity.ace_other.ace_attribute-name { color:#606060;}.ace-clouds .ace_markup.ace_underline { text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
				`@@ -1 +0,0 @@`
				define("ace/theme/clouds_midnight",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-clouds-midnight",b.cssText=".ace-clouds-midnight .ace_editor { border: 2px solid rgb(159, 159, 159);}.ace-clouds-midnight .ace_editor.ace_focus { border: 2px solid #327fbd;}.ace-clouds-midnight .ace_gutter { background: #e8e8e8; color: #333;}.ace-clouds-midnight .ace_print_margin { width: 1px; background: #e8e8e8;}.ace-clouds-midnight .ace_scroller { background-color: #191919;}.ace-clouds-midnight .ace_text-layer { cursor: text; color: #929292;}.ace-clouds-midnight .ace_cursor { border-left: 2px solid #7DA5DC;}.ace-clouds-midnight .ace_cursor.ace_overwrite { border-left: 0px; border-bottom: 1px solid #7DA5DC;} .ace-clouds-midnight .ace_marker-layer .ace_selection { background: #000000;}.ace-clouds-midnight .ace_marker-layer .ace_step { background: rgb(198, 219, 174);}.ace-clouds-midnight .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; border: 1px solid #BFBFBF;}.ace-clouds-midnight .ace_marker-layer .ace_active_line { background: rgba(215, 215, 215, 0.031);}.ace-clouds-midnight .ace_marker-layer .ace_selected_word { border: 1px solid #000000;} .ace-clouds-midnight .ace_invisible { color: #BFBFBF;}.ace-clouds-midnight .ace_keyword { color:#927C5D;}.ace-clouds-midnight .ace_keyword.ace_operator { color:#4B4B4B;}.ace-clouds-midnight .ace_constant.ace_language { color:#39946A;}.ace-clouds-midnight .ace_constant.ace_numeric { color:#46A609;}.ace-clouds-midnight .ace_invalid { color:#FFFFFF;background-color:#E92E2E;}.ace-clouds-midnight .ace_fold { background-color: #927C5D; border-color: #929292;}.ace-clouds-midnight .ace_support.ace_function { color:#E92E2E;}.ace-clouds-midnight .ace_string { color:#5D90CD;}.ace-clouds-midnight .ace_comment { color:#3C403B;}.ace-clouds-midnight .ace_entity.ace_other.ace_attribute-name { color:#606060;}.ace-clouds-midnight .ace_markup.ace_underline { text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
				`@@ -1 +0,0 @@`
				define("ace/theme/cobalt",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!0,b.cssClass="ace-cobalt",b.cssText=".ace-cobalt .ace_editor { border: 2px solid rgb(159, 159, 159);}.ace-cobalt .ace_editor.ace_focus { border: 2px solid #327fbd;}.ace-cobalt .ace_gutter { background: #e8e8e8; color: #333;}.ace-cobalt .ace_print_margin { width: 1px; background: #e8e8e8;}.ace-cobalt .ace_scroller { background-color: #002240;}.ace-cobalt .ace_text-layer { cursor: text; color: #FFFFFF;}.ace-cobalt .ace_cursor { border-left: 2px solid #FFFFFF;}.ace-cobalt .ace_cursor.ace_overwrite { border-left: 0px; border-bottom: 1px solid #FFFFFF;} .ace-cobalt .ace_marker-layer .ace_selection { background: rgba(179, 101, 57, 0.75);}.ace-cobalt .ace_marker-layer .ace_step { background: rgb(198, 219, 174);}.ace-cobalt .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; border: 1px solid rgba(255, 255, 255, 0.15);}.ace-cobalt .ace_marker-layer .ace_active_line { background: rgba(0, 0, 0, 0.35);}.ace-cobalt .ace_marker-layer .ace_selected_word { border: 1px solid rgba(179, 101, 57, 0.75);} .ace-cobalt .ace_invisible { color: rgba(255, 255, 255, 0.15);}.ace-cobalt .ace_keyword { color:#FF9D00;}.ace-cobalt .ace_constant { color:#FF628C;}.ace-cobalt .ace_invalid { color:#F8F8F8;background-color:#800F00;}.ace-cobalt .ace_support { color:#80FFBB;}.ace-cobalt .ace_fold { background-color: #FF9D00; border-color: #FFFFFF;}.ace-cobalt .ace_support.ace_function { color:#FFB054;}.ace-cobalt .ace_string.ace_regexp { color:#80FFC2;}.ace-cobalt .ace_comment { font-style:italic;color:#0088FF;}.ace-cobalt .ace_variable { color:#CCCCCC;}.ace-cobalt .ace_variable.ace_language { color:#FF80E1;}.ace-cobalt .ace_meta.ace_tag { color:#9EFFFF;}.ace-cobalt .ace_markup.ace_underline { text-decoration:underline;}.ace-cobalt .ace_markup.ace_heading { color:#C8E4FD;background-color:#001221;}.ace-cobalt .ace_markup.ace_list { background-color:#130D26;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
				`@@ -1 +0,0 @@`
				define("ace/theme/crimson_editor",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssText=".ace-crimson-editor .ace_editor { border: 2px solid rgb(159, 159, 159);}.ace-crimson-editor .ace_editor.ace_focus { border: 2px solid #327fbd;}.ace-crimson-editor .ace_gutter { width: 50px; background: #e8e8e8; color: #333; overflow : hidden;}.ace-crimson-editor .ace_gutter-layer { width: 100%; text-align: right;}.ace-crimson-editor .ace_gutter-layer .ace_gutter-cell { padding-right: 6px;}.ace-crimson-editor .ace_print_margin { width: 1px; background: #e8e8e8;}.ace-crimson-editor .ace_text-layer { cursor: text; color: rgb(64, 64, 64);}.ace-crimson-editor .ace_cursor { border-left: 2px solid black;}.ace-crimson-editor .ace_cursor.ace_overwrite { border-left: 0px; border-bottom: 1px solid black;}.ace-crimson-editor .ace_line .ace_invisible { color: rgb(191, 191, 191);}.ace-crimson-editor .ace_line .ace_identifier { color: black;}.ace-crimson-editor .ace_line .ace_keyword { color: blue;}.ace-crimson-editor .ace_line .ace_constant.ace_buildin { color: rgb(88, 72, 246);}.ace-crimson-editor .ace_line .ace_constant.ace_language { color: rgb(255, 156, 0);}.ace-crimson-editor .ace_line .ace_constant.ace_library { color: rgb(6, 150, 14);}.ace-crimson-editor .ace_line .ace_invalid { text-decoration: line-through; color: rgb(224, 0, 0);}.ace-crimson-editor .ace_line .ace_fold {}.ace-crimson-editor .ace_line .ace_support.ace_function { color: rgb(192, 0, 0);}.ace-crimson-editor .ace_line .ace_support.ace_constant { color: rgb(6, 150, 14);}.ace-crimson-editor .ace_line .ace_support.ace_type,.ace-crimson-editor .ace_line .ace_support.ace_class { color: rgb(109, 121, 222);}.ace-crimson-editor .ace_line .ace_keyword.ace_operator { color: rgb(49, 132, 149);}.ace-crimson-editor .ace_line .ace_string { color: rgb(128, 0, 128);}.ace-crimson-editor .ace_line .ace_comment { color: rgb(76, 136, 107);}.ace-crimson-editor .ace_line .ace_comment.ace_doc { color: rgb(0, 102, 255);}.ace-crimson-editor .ace_line .ace_comment.ace_doc.ace_tag { color: rgb(128, 159, 191);}.ace-crimson-editor .ace_line .ace_constant.ace_numeric { color: rgb(0, 0, 64);}.ace-crimson-editor .ace_line .ace_variable { color: rgb(0, 64, 128);}.ace-crimson-editor .ace_line .ace_xml_pe { color: rgb(104, 104, 91);}.ace-crimson-editor .ace_marker-layer .ace_selection { background: rgb(181, 213, 255);}.ace-crimson-editor .ace_marker-layer .ace_step { background: rgb(252, 255, 0);}.ace-crimson-editor .ace_marker-layer .ace_stack { background: rgb(164, 229, 101);}.ace-crimson-editor .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; border: 1px solid rgb(192, 192, 192);}.ace-crimson-editor .ace_marker-layer .ace_active_line { background: rgb(232, 242, 254);}.ace-crimson-editor .ace_meta.ace_tag { color:rgb(28, 2, 255);}.ace-crimson-editor .ace_marker-layer .ace_selected_word { background: rgb(250, 250, 255); border: 1px solid rgb(200, 200, 250);}.ace-crimson-editor .ace_string.ace_regex { color: rgb(192, 0, 192);}",b.cssClass="ace-crimson-editor";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
				`@@ -1 +0,0 @@`
				define("ace/theme/dawn",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssClass="ace-dawn",b.cssText=".ace-dawn .ace_editor { border: 2px solid rgb(159, 159, 159);}.ace-dawn .ace_editor.ace_focus { border: 2px solid #327fbd;}.ace-dawn .ace_gutter { background: #e8e8e8; color: #333;}.ace-dawn .ace_print_margin { width: 1px; background: #e8e8e8;}.ace-dawn .ace_scroller { background-color: #F9F9F9;}.ace-dawn .ace_text-layer { cursor: text; color: #080808;}.ace-dawn .ace_cursor { border-left: 2px solid #000000;}.ace-dawn .ace_cursor.ace_overwrite { border-left: 0px; border-bottom: 1px solid #000000;} .ace-dawn .ace_marker-layer .ace_selection { background: rgba(39, 95, 255, 0.30);}.ace-dawn .ace_marker-layer .ace_step { background: rgb(198, 219, 174);}.ace-dawn .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; border: 1px solid rgba(75, 75, 126, 0.50);}.ace-dawn .ace_marker-layer .ace_active_line { background: rgba(36, 99, 180, 0.12);}.ace-dawn .ace_marker-layer .ace_selected_word { border: 1px solid rgba(39, 95, 255, 0.30);} .ace-dawn .ace_invisible { color: rgba(75, 75, 126, 0.50);}.ace-dawn .ace_keyword { color:#794938;}.ace-dawn .ace_constant { color:#811F24;}.ace-dawn .ace_invalid.ace_illegal { text-decoration:underline;font-style:italic;color:#F8F8F8;background-color:#B52A1D;}.ace-dawn .ace_invalid.ace_deprecated { text-decoration:underline;font-style:italic;color:#B52A1D;}.ace-dawn .ace_support { color:#691C97;}.ace-dawn .ace_fold { background-color: #794938; border-color: #080808;}.ace-dawn .ace_support.ace_function { color:#693A17;}.ace-dawn .ace_string { color:#0B6125;}.ace-dawn .ace_string.ace_regexp { color:#CF5628;}.ace-dawn .ace_comment { font-style:italic;color:#5A525F;}.ace-dawn .ace_variable { color:#234A97;}.ace-dawn .ace_markup.ace_underline { text-decoration:underline;}.ace-dawn .ace_markup.ace_heading { color:#19356D;}.ace-dawn .ace_markup.ace_list { color:#693A17;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
				`@@ -1 +0,0 @@`
				define("ace/theme/dreamweaver",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssClass="ace-tm",b.cssText=".ace-tm .ace_editor { border: 2px solid rgb(159, 159, 159);}.ace-tm .ace_editor.ace_focus { border: 2px solid #327fbd;}.ace-tm .ace_gutter { background: #e8e8e8; color: #333;}.ace-tm .ace_print_margin { width: 1px; background: #e8e8e8;}.ace-tm .ace_fold { background-color: #00F;}.ace-tm .ace_text-layer { cursor: text;}.ace-tm .ace_cursor { border-left: 2px solid black;}.ace-tm .ace_cursor.ace_overwrite { border-left: 0px; border-bottom: 1px solid black;} .ace-tm .ace_line .ace_invisible { color: rgb(191, 191, 191);}.ace-tm .ace_line .ace_keyword { color: blue;}.ace-tm .ace_line .ace_constant.ace_buildin { color: rgb(88, 72, 246);}.ace-tm .ace_line .ace_constant.ace_language { color: rgb(88, 92, 246);}.ace-tm .ace_line .ace_constant.ace_library { color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_invalid { background-color: rgb(153, 0, 0); color: white;}.ace-tm .ace_line .ace_support.ace_function { color: rgb(60, 76, 114);}.ace-tm .ace_line .ace_support.ace_constant { color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_support.ace_type,.ace-tm .ace_line .ace_support.ace_class { color: #009;}.ace-tm .ace_line .ace_support.ace_php_tag { color: #f00;}.ace-tm .ace_line .ace_keyword.ace_operator { color: rgb(104, 118, 135);}.ace-tm .ace_line .ace_string { color: #00F;}.ace-tm .ace_line .ace_comment { color: rgb(76, 136, 107);}.ace-tm .ace_line .ace_comment.ace_doc { color: rgb(0, 102, 255);}.ace-tm .ace_line .ace_comment.ace_doc.ace_tag { color: rgb(128, 159, 191);}.ace-tm .ace_line .ace_constant.ace_numeric { color: rgb(0, 0, 205);}.ace-tm .ace_line .ace_variable { color: #06F}.ace-tm .ace_line .ace_xml_pe { color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function { color: #00F;}.ace-tm .ace_markup.ace_markupine { text-decoration:underline;}.ace-tm .ace_markup.ace_heading { color: rgb(12, 7, 255);}.ace-tm .ace_markup.ace_list { color:rgb(185, 6, 144);}.ace-tm .ace_marker-layer .ace_selection { background: rgb(181, 213, 255);}.ace-tm .ace_marker-layer .ace_step { background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack { background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active_line { background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_marker-layer .ace_selected_word { background: rgb(250, 250, 255); border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_meta.ace_tag { color:#009;}.ace-tm .ace_meta.ace_tag.ace_anchor { color:#060;}.ace-tm .ace_meta.ace_tag.ace_form { color:#F90;}.ace-tm .ace_meta.ace_tag.ace_image { color:#909;}.ace-tm .ace_meta.ace_tag.ace_script { color:#900;}.ace-tm .ace_meta.ace_tag.ace_style { color:#909;}.ace-tm .ace_meta.ace_tag.ace_table { color:#099;}.ace-tm .ace_string.ace_regex { color: rgb(255, 0, 0)}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})