Merge remote-tracking branch 'remotes/oficial/master' into patch-2

Add support for freeIPA ldap auth

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -62,3 +62,4 @@ HOWTO-web2py-devel
 .idea/*
 site-packages/
 logs/
+__pycache__/

.gitmodules

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

.travis.yml

@@ -1,13 +1,21 @@
 language: python
 
 sudo: required
-
 cache: pip
+dist: "bionic"
+
+services:
+  - mysql
 
 python:
   - '2.7'
-  - 'pypy'
+  - '3.6'
-  - '3.5'
+  - '3.7'
+  - 'pypy3.5'
+
+matrix:
+  allow_failures:
+    - python: 'pypy3.5'
 
 install:
   - pip install -e .
@@ -15,11 +23,9 @@ install:
 before_script:
   - pip install coverage
   - pip install codecov
-  - mysql -e 'create database pydal;'
-  - psql -c 'create database pydal;' -U postgres
-  - psql -c 'create extension postgis;' -U postgres -d pydal;
-  - psql -c 'SHOW SERVER_VERSION' -U postgres
 
+before_install:
+  - mysql -e 'create database pydal;'
 
 script: export COVERAGE_PROCESS_START=gluon/tests/coverage.ini; ./web2py.py --run_system_tests --with_coverage
 
@@ -29,6 +35,3 @@ after_success:
 
 notifications:
   email: true
-
-addons:
-  postgresql: "9.4"

CHANGELOG

@@ -1,8 +1,68 @@
+## 2.19.0
+- new command line options (Thanks Paolo Pastori)
 
-## 2.15.x
+OLD NAME                   NEW NAME
-- web2py does not support python 2.6 anymore
+==================         ==================
-- py3.5 syntax compatible (see #1353 for details)
+--debug                     --log_level
-- dropped web shell from admin
+--nogui                     --no_gui
+--ssl_private_key           --server_key
+--ssl_certificate           --server_cert
+--minthreads                --min_threads
+--maxthreads                --max_threads
+--profiler                  --profiler_dir
+--run-cron                  --with_cron
+--softcron                  --soft_cron
+--cron                      --cron_run
+--cronjob *                 --cron_job *
+--test                      --run_doctests
+                            --add_options
+                            --interface
+                            --crontab
+
+## 2.18.1-2.18.5
+- pydal 19.04
+- made template its own module (Yet Another Template Language)
+- improved python 3.4-3.7 support
+- better regular expressions
+- bug fixes
+
+## 2.17.1-2
+- pydal 18.08
+- many small bug fixes
+
+## 2.16.1
+- pydal 17.11
+- bootstrap 4 
+- better welcome examples
+- many bug fixes
+
+## 2.15.1-4
+- pydal 17.08
+- dropped support for python 2.6
+- dropped web shell
+- experimental python 3 support
+- experimental authapi for service login
+- allow ajax file uploads
+- more tests
+- more pep8 compliance
+- d3.js model visulization
+- improved scheduler
+- is_email support for internationalized Domain Names
+- improved used of cookies with CookieJar
+- SQLFORM.grid(showblobs=True)
+- import JS events (added w2p.componentBegin event)
+- added support for CASv3
+- allow first_name and last_name placeholders in verify_email message
+- added three-quote support in markmin
+- updated pg8000 driver (but we still recommend psycopg2)
+- compiled views use . separator not _ separator (must recompile code)
+- better serbian, french, and catalan translations
+- speed improvements (refactor of compileapp and pyc caching)
+- removed web shell (never worked as intended)
+- allow Expose(..., follow_symlink_out=False).
+- Updated fpdf to latest version
+- JWT support
+- import fabfile for remote deployment
 - scheduler new feature: you can now specify intervals with cron
 - gluon/* removed from sys.path. Applications relying on statements like e.g.
   "from storage import Storage"
@@ -10,8 +70,18 @@
   "from gluon.storage import Storage"
 - tests can only be run with the usual web2py.py --run_system_tests OR with
   python -m unittest -v gluon.tests on the root dir
-- updated pymysql driver
+- jQuery 3.2.1
-
+- PyDAL 17.07 including:
+  allow jsonb support for postgres
+  correctly configure adapters that need connection for configuration
+  better caching
+  updated IMAP adapter methods to new API
+  experimental suport for joinable subselects
+  improved Teradata support
+  improved mongodb support
+  overall refactoring
+  experimental support for Google Cloud SQL v2
+  new pymysql driver
 
 ## 2.14.6
 

Makefile

@@ -6,23 +6,24 @@ clean:
 	rm -f httpserver.log 
 	rm -f parameters*.py 
 	rm -f -r applications/*/compiled
-	find ./ -name '*~' -exec rm -f {} \; 
+	find . -name '*~' -exec rm -f {} \; 
-	find ./ -name '*.orig' -exec rm -f {} \; 
+	find . -name '*.orig' -exec rm -f {} \; 
-	find ./ -name '*.rej' -exec rm -f {} \; 
+	find . -name '*.rej' -exec rm -f {} \; 
-	find ./ -name '#*' -exec rm -f {} \;
+	find . -name '#*' -exec rm -f {} \;
-	find ./ -name 'Thumbs.db' -exec rm -f {} \; 
+	find . -name 'Thumbs.db' -exec rm -f {} \; 
-	# find ./gluon/ -name '.*' -exec rm -f {} \;
+	# find . -name '.tox' -exec rm -rf {} \; 
-	find ./gluon/ -name '*class' -exec rm -f {} \; 
+	# find . -name '__pycache__' -exec rm -rf {} \; 
-	find ./applications/admin/ -name '.*' -exec rm -f {} \; 
+	find gluon/ -name '*class' -exec rm -f {} \; 
-	find ./applications/examples/ -name '.*' -exec rm -f {} \; 
+	find applications/admin/ -name '.*' -exec rm -f {} \; 
-	find ./applications/welcome/ -name '.*' -exec rm -f {} \; 
+	find applications/examples/ -name '.*' -exec rm -f {} \; 
-	find ./ -name '*.pyc' -exec rm -f {} \;
+	find applications/welcome/ -name '.*' -exec rm -f {} \; 
+	find . -name '*.pyc' -exec rm -f {} \;
 tests:
-	python web2py.py --run_system_tests
+	python web2py.py --verbose --run_system_tests
 coverage:
 	coverage erase --rcfile=gluon/tests/coverage.ini
 	export COVERAGE_PROCESS_START=gluon/tests/coverage.ini
-	python web2py.py --run_system_tests --with_coverage
+	python web2py.py --verbose --run_system_tests --with_coverage
 	coverage combine --rcfile=gluon/tests/coverage.ini
 	sleep 1
 	coverage html --rcfile=gluon/tests/coverage.ini
@@ -30,11 +31,7 @@ update:
 	wget -O gluon/contrib/feedparser.py http://feedparser.googlecode.com/svn/trunk/feedparser/feedparser.py
 	wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
 	echo "remember that pymysql was tweaked"
-src:
+rmfiles:
-	### Use semantic versioning
-	echo 'Version 2.14.6-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 -rf applications/*/sessions/*
@@ -46,6 +43,12 @@ src:
 	rm -rf applications/admin/uploads/*                 
 	rm -rf applications/welcome/uploads/*               
 	rm -rf applications/examples/uploads/* 
+src:
+	### Use semantic versioning
+	echo 'Version 2.18.5-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	### rm -f all junk files
+	make clean
+	# make rmfiles
 	### make welcome layout and appadmin the default
 	cp applications/welcome/views/appadmin.html applications/admin/views
 	cp applications/welcome/views/appadmin.html applications/examples/views
@@ -54,7 +57,7 @@ src:
 	### build web2py_src.zip
 	echo '' > NEWINSTALL
 	mv web2py_src.zip web2py_src_old.zip | echo 'no old'
-	cd ..; zip -r web2py/web2py_src.zip web2py/web2py.py web2py/anyserver.py web2py/gluon/* web2py/extras/* web2py/handlers/* web2py/examples/* web2py/README.markdown  web2py/LICENSE web2py/CHANGELOG web2py/NEWINSTALL web2py/VERSION web2py/MANIFEST.in web2py/scripts/*.sh web2py/scripts/*.py web2py/applications/admin web2py/applications/examples/ web2py/applications/welcome web2py/applications/__init__.py web2py/site-packages/__init__.py web2py/gluon/tests/*.sh web2py/gluon/tests/*.py
+	cd ..; zip -r --exclude=**.git** --exclude=**.tox** --exclude=**_pycache__** web2py/web2py_src.zip web2py/web2py.py web2py/anyserver.py web2py/fabfile.py web2py/gluon/* web2py/extras/* web2py/handlers/* web2py/examples/* web2py/README.markdown  web2py/LICENSE web2py/CHANGELOG web2py/NEWINSTALL web2py/VERSION web2py/MANIFEST.in web2py/scripts/*.sh web2py/scripts/*.py web2py/applications/admin web2py/applications/examples/ web2py/applications/welcome web2py/applications/__init__.py web2py/site-packages/__init__.py web2py/gluon/tests/*.sh web2py/gluon/tests/*.py
 
 mdp:
 	make src
@@ -97,6 +100,8 @@ win:
 	cp -r applications/welcome ../web2py_win/web2py/applications
 	cp -r applications/examples ../web2py_win/web2py/applications
 	cp applications/__init__.py ../web2py_win/web2py/applications
+	# per https://github.com/web2py/web2py/issues/1716
+	mv ../web2py_win/web2py/_ssl.pyd ../web2py_win/web2py/_ssl.pyd.legacy | echo 'done'
 	cd ../web2py_win; zip -r web2py_win.zip web2py
 	mv ../web2py_win/web2py_win.zip .
 run:

VERSION

@@ -1 +1 @@
-Version 2.14.6-stable+timestamp.2016.05.09.19.18.48
+Version 2.18.5-stable+timestamp.2019.04.07.21.13.59

anyserver.py

@@ -43,8 +43,8 @@ class Servers:
 
     @staticmethod
     def cherrypy(app, address, **options):
-        from cherrypy import wsgiserver
+        from cheroot.wsgi import Server as WSGIServer
-        server = wsgiserver.CherryPyWSGIServer(address, app)
+        server = WSGIServer(address, app)
         server.start()
 
     @staticmethod
@@ -212,16 +212,16 @@ def mongrel2_handler(application, conn, debug=False):
 
     while True:
         if debug:
-            print "WAITING FOR REQUEST"
+            print("WAITING FOR REQUEST")
 
         # receive a request
         req = conn.recv()
         if debug:
-            print "REQUEST BODY: %r\n" % req.body
+            print("REQUEST BODY: %r\n" % req.body)
 
         if req.is_disconnect():
             if debug:
-                print "DISCONNECT"
+                print("DISCONNECT")
             continue  # effectively ignore the disconnect from the client
 
         # Set a couple of environment attributes a.k.a. header attributes
@@ -247,7 +247,7 @@ def mongrel2_handler(application, conn, debug=False):
         environ['wsgi.input'] = req.body
 
         if debug:
-            print "ENVIRON: %r\n" % environ
+            print("ENVIRON: %r\n" % environ)
 
         # SimpleHandler needs file-like stream objects for
         # requests, errors and responses
@@ -282,10 +282,10 @@ def mongrel2_handler(application, conn, debug=False):
 
         # return the response
         if debug:
-            print "RESPONSE: %r\n" % response
+            print("RESPONSE: %r\n" % response)
         if errors:
             if debug:
-                print "ERRORS: %r" % errors
+                print("ERRORS: %r" % errors)
             data = "%s\r\n\r\n%s" % (data, errors)
         conn.reply_http(
             req, data, code=code, status=status, headers=headers)
@@ -355,8 +355,8 @@ def main():
                       dest='workers',
                       help='number of workers number')
     (options, args) = parser.parse_args()
-    print 'starting %s on %s:%s...' % (
+    print('starting %s on %s:%s...' % (
-        options.server, options.ip, options.port)
+        options.server, options.ip, options.port))
     run(options.server, options.ip, options.port,
         logging=options.logging, profiler=options.profiler_dir,
         options=options)

applications/admin/controllers/appadmin.py

@@ -12,11 +12,6 @@ import gluon.contenttype
 import gluon.fileutils
 from gluon._compat import iteritems
 
-try:
-    import pygraphviz as pgv
-except ImportError:
-    pgv = None
-
 is_gae = request.env.web2py_runtime_gae or False
 
 # ## critical --- make a copy of the environment
@@ -35,7 +30,7 @@ except:
 
 if request.is_https:
     session.secure()
-elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1") and \
+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'))
 
@@ -51,7 +46,7 @@ if request.function == 'manage':
                                       auth.table_permission()])
     manager_role = manager_action.get('role', None) if manager_action else None
     if not (gluon.fileutils.check_credentials(request) or auth.has_membership(manager_role)):
-        raise HTTP(403, "Not authorized")
+        raise HTTP(403, 'Not authorized')
     menu = False
 elif (request.application == 'admin' and not session.authorized) or \
         (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
@@ -187,12 +182,12 @@ def select():
     db = get_database(request)
     dbname = request.args[0]
     try:
-        is_imap = db._uri.startswith("imap://")
+        is_imap = db._uri.startswith('imap://')
     except (KeyError, AttributeError, TypeError):
         is_imap = False
-    regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
+    regex = re.compile(r'(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
     if len(request.args) > 1 and hasattr(db[request.args[1]], '_primarykey'):
-        regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
+        regex = re.compile(r'(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
     if request.vars.query:
         match = regex.match(request.vars.query)
         if match:
@@ -229,20 +224,20 @@ def select():
     session.last_orderby = orderby
     session.last_query = request.vars.query
     form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
-                _name='query', _value=request.vars.query or '',
+                _name='query', _value=request.vars.query or '', _class='form-control',
                 requires=IS_NOT_EMPTY(
-                    error_message=T("Cannot be empty")))), TR(T('Update:'),
+                    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 '', _class='form-control')), TR(T('Delete:'), INPUT(_name='delete_check',
                 _class='delete', _type='checkbox', value=False), ''),
-                TR('', '', INPUT(_type='submit', _value=T('submit')))),
+                TR('', '', INPUT(_type='submit', _value=T('Submit'), _class='btn btn-primary'))),
                 _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+)\..+')
+        regex = re.compile(request.args[0] + r'\.(?P<table>\w+)\..+')
         match = regex.match(form.vars.query.strip())
         if match:
             table = match.group('table')
@@ -259,8 +254,8 @@ def select():
 
             if is_imap:
                 fields = [db[table][name] for name in
-                    ("id", "uid", "created", "to",
+                    ('id', 'uid', 'created', 'to',
-                     "sender", "subject")]
+                     'sender', 'subject')]
             if orderby:
                 rows = db(query, ignore_common_filters=True).select(
                               *fields, limitby=(start, stop),
@@ -276,10 +271,10 @@ def select():
     # begin handle upload csv
     csv_table = table or request.vars.table
     if csv_table:
-        formcsv = FORM(str(T('or import from csv file')) + " ",
+        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')))
+                       INPUT(_type='submit', _value=T('import'), _class='btn btn-primary'))
     else:
         formcsv = None
     if formcsv and formcsv.process().accepted:
@@ -361,26 +356,26 @@ def state():
 def ccache():
     if is_gae:
         form = FORM(
-            P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")))
+            P(TAG.BUTTON(T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')))
     else:
         cache.ram.initialize()
         cache.disk.initialize()
 
         form = FORM(
             P(TAG.BUTTON(
-                T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+                T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')),
             P(TAG.BUTTON(
-                T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+                T('Clear RAM'), _type='submit', _name='ram', _value='ram')),
             P(TAG.BUTTON(
-                T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+                T('Clear DISK'), _type='submit', _name='disk', _value='disk')),
         )
 
     if form.accepts(request.vars, session):
-        session.flash = ""
+        session.flash = ''
         if is_gae:
             if request.vars.yes:
                 cache.ram.clear()
-                session.flash += T("Cache Cleared")
+                session.flash += T('Cache Cleared')
         else:
             clear_ram = False
             clear_disk = False
@@ -392,17 +387,16 @@ def ccache():
                 clear_disk = True
             if clear_ram:
                 cache.ram.clear()
-                session.flash += T("Ram Cleared")
+                session.flash += T('Ram Cleared')
             if clear_disk:
                 cache.disk.clear()
-                session.flash += T("Disk Cleared")
+                session.flash += T('Disk Cleared')
         redirect(URL(r=request))
 
     try:
-        from guppy import hpy
+        from pympler.asizeof import asizeof
-        hp = hpy()
     except ImportError:
-        hp = False
+        asizeof = False
 
     import shelve
     import os
@@ -442,7 +436,7 @@ def ccache():
             gae_stats['ratio'] = ((gae_stats['hits'] * 100) /
                 (gae_stats['hits'] + gae_stats['misses']))
         except ZeroDivisionError:
-            gae_stats['ratio'] = T("?")
+            gae_stats['ratio'] = T('?')
         gae_stats['oldest'] = GetInHMS(time.time() - gae_stats['oldest_item_age'])
         total.update(gae_stats)
     else:
@@ -456,9 +450,9 @@ def ccache():
             ram['ratio'] = 0
 
         for key, value in iteritems(cache.ram.storage):
-            if hp:
+            if asizeof:
-                ram['bytes'] += hp.iso(value[1]).size
+                ram['bytes'] += asizeof(value[1])
-                ram['objects'] += hp.iso(value[1]).count
+                ram['objects'] += 1
             ram['entries'] += 1
             if value[0] < ram['oldest']:
                 ram['oldest'] = value[0]
@@ -474,9 +468,9 @@ def ccache():
                 except (KeyError, ZeroDivisionError):
                     disk['ratio'] = 0
             else:
-                if hp:
+                if asizeof:
-                    disk['bytes'] += hp.iso(value[1]).size
+                    disk['bytes'] += asizeof(value[1])
-                    disk['objects'] += hp.iso(value[1]).count
+                    disk['objects'] += 1
                 disk['entries'] += 1
                 if value[0] < disk['oldest']:
                     disk['oldest'] = value[0]
@@ -508,7 +502,7 @@ def ccache():
             TR(TD(B(T('Key'))), TD(B(T('Time in Cache (h:m:s)')))),
             *[TR(TD(k[0]), TD('%02d:%02d:%02d' % k[1])) for k in keys],
             **dict(_class='cache-keys',
-                   _style="border-collapse: separate; border-spacing: .5em;"))
+                   _style='border-collapse: separate; border-spacing: .5em;'))
 
     if not is_gae:
         ram['keys'] = key_table(ram['keys'])
@@ -516,7 +510,7 @@ def ccache():
         total['keys'] = key_table(total['keys'])
 
     return dict(form=form, total=total,
-                ram=ram, disk=disk, object_stats=hp != False)
+                ram=ram, disk=disk, object_stats=asizeof != False)
 
 
 def table_template(table):
@@ -542,80 +536,29 @@ def table_template(table):
     # This is horribe HTML but the only one graphiz understands
     rows = []
     cellpadding = 4
-    color = "#000000"
+    color = '#000000'
-    bgcolor = "#FFFFFF"
+    bgcolor = '#FFFFFF'
-    face = "Helvetica"
+    face = 'Helvetica'
-    face_bold = "Helvetica Bold"
+    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)))
+                           _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,
+                              _align='left', _cellpadding=cellpadding,
                               _border=border),
                        TD(FONT(row.type, _color=color, _face=face),
-                               _align="left", _cellpadding=cellpadding,
+                               _align='left', _cellpadding=cellpadding,
                                _border=border),
                        TD(FONT(types(row), _color=color, _face=face),
-                               _align="center", _cellpadding=cellpadding,
+                               _align='center', _cellpadding=cellpadding,
                                _border=border)))
-    return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
+    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=request.application, color='#ECECEC')
-
-        group = meta_graphmodel['group'].replace(' ', '')
-        if group not in subgraphs:
-            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
-        subgraphs[group]['tables'].append(tablename)
-
-        graph.add_node(tablename, name=tablename, shape='plaintext',
-                       label=table_template(tablename))
-
-    for n, key in enumerate(subgraphs.iterkeys()):
-        graph.subgraph(nbunch=subgraphs[key]['tables'],
-                    name='cluster%d' % n,
-                    style='filled',
-                    color=subgraphs[key]['meta']['color'],
-                    label=subgraphs[key]['meta']['group'])
-
-    for tablename in db.tables:
-        for field in db[tablename]:
-            f_type = field.type
-            if isinstance(f_type,str) and (
-                f_type.startswith('reference') or
-                f_type.startswith('list:reference')):
-                referenced_table = f_type.split()[1].split('.')[0]
-                n1 = graph.get_node(tablename)
-                n2 = graph.get_node(referenced_table)
-                graph.add_edge(n1, n2, color="#4C4C4C", label='')
-
-    graph.layout()
-    if not request.args:
-        response.headers['Content-Type'] = 'image/png'
-        return graph.draw(format='png', prog='dot')
-    else:
-        response.headers['Content-Disposition']='attachment;filename=graph.%s'%request.args(0)
-        if request.args(0) == 'dot':
-            return graph.string()
-        else:
-            return graph.draw(format=request.args(0), prog='dot')
-
-def graph_model():
-    return dict(databases=databases, pgv=pgv)
-
 def manage():
     tables = manager_action['tables']
     if isinstance(tables[0], str):
@@ -645,7 +588,7 @@ def manage():
         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]
+            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():
@@ -661,13 +604,13 @@ def manage():
 def hooks():
     import functools
     import inspect
-    list_op=['_%s_%s' %(h,m) for h in ['before', 'after'] for m in ['insert','update','delete']]
+    list_op = ['_%s_%s' %(h,m) for h in ['before', 'after'] for m in ['insert','update','delete']]
-    tables=[]
+    tables = []
-    with_build_it=False
+    with_build_it = False
     for db_str in sorted(databases):
         db = databases[db_str]
         for t in db.tables:
-            method_hooks=[]
+            method_hooks = []
             for op in list_op:
                 functions = []
                 for f in getattr(db[t], op):
@@ -687,16 +630,64 @@ def hooks():
                         except:
                             pass
                 if len(functions):
-                    method_hooks.append({'name':op, 'functions':functions})
+                    method_hooks.append({'name': op, 'functions':functions})
             if len(method_hooks):
-                tables.append({'name':"%s.%s" % (db_str,t), 'slug': IS_SLUG()("%s.%s" % (db_str,t))[0], 'method_hooks':method_hooks})
+                tables.append({'name': '%s.%s' % (db_str, t), 'slug': IS_SLUG()('%s.%s' % (db_str,t))[0], 'method_hooks':method_hooks})
     # Render
     ul_main = UL(_class='nav nav-list')
     for t in tables:
         ul_main.append(A(t['name'], _onclick="collapse('a_%s')" % t['slug']))
-        ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
+        ul_t = UL(_class='nav nav-list', _id='a_%s' % t['slug'], _style='display:none')
         for op in t['method_hooks']:
-            ul_t.append(LI (op['name']))
+            ul_t.append(LI(op['name']))
-            ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
+            ul_t.append(UL([LI(A(f['funcname'], _class='editor_filelink', _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main
+
+
+# ##########################################################
+# d3 based model visualizations
+# ###########################################################
+
+def d3_graph_model():
+    ''' See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
+    and also the app_admin bg_graph_model function
+
+    Create a list of table dicts, called 'nodes'
+    '''
+
+    nodes = []
+    links = []
+
+    for database in databases:
+        db = eval_in_global_env(database)
+        for tablename in db.tables:
+            fields = []
+            for field in db[tablename]:
+                f_type = field.type
+                if not isinstance(f_type, str):
+                    disp = ' '
+                elif f_type == 'string':
+                    disp = field.length
+                elif f_type == 'id':
+                    disp = 'PK'
+                elif f_type.startswith('reference') or \
+                    f_type.startswith('list:reference'):
+                    disp = 'FK'
+                else:
+                    disp = ' '
+                fields.append(dict(name=field.name, type=field.type, disp=disp))
+
+                if isinstance(f_type, str) and (
+                    f_type.startswith('reference') or
+                    f_type.startswith('list:reference')):
+                    referenced_table = f_type.split()[1].split('.')[0]
+
+                    links.append(dict(source=tablename, target = referenced_table))
+
+            nodes.append(dict(name=tablename, type='table', fields = fields))
+
+    # d3 v4 allows individual modules to be specified.  The complete d3 library is included below.
+    response.files.append(URL('admin','static','js/d3.min.js'))
+    response.files.append(URL('admin','static','js/d3_graph.js'))
+    return dict(databases=databases, nodes=nodes, links=links)

applications/admin/controllers/debug.py

@@ -6,6 +6,7 @@ import gluon.validators
 import code
 from gluon.debug import communicate, web_debugger, dbg_debugger
 from gluon._compat import thread
+from gluon.fileutils import open_file
 import pydoc
 
 
@@ -54,7 +55,7 @@ def interact():
     if filename:
         # prevent IOError 2 on some circuntances (EAFP instead of os.access)
         try:
-            lines = open(filename).readlines()
+            lines = open_file(filename, 'r').readlines()
         except:
             lines = ""
         lines = dict([(i + 1, l) for (i, l) in enumerate(

applications/admin/controllers/default.py

@@ -16,6 +16,7 @@ from gluon.tools import Config
 from gluon.compileapp import find_exposed_functions
 from glob import glob
 from gluon._compat import iteritems, PY2, pickle, xrange, urlopen, to_bytes, StringIO, to_native
+import gluon.rewrite
 import shutil
 import platform
 
@@ -165,9 +166,9 @@ def check_version():
     new_version, version = check_new_version(request.env.web2py_version,
                                              WEB2PY_VERSION_URL)
 
-    if new_version == -1:
+    if new_version in (-1, -2):
         return A(T('Unable to check for upgrades'), _href=WEB2PY_URL)
-    elif new_version != True:
+    elif not new_version:
         return A(T('web2py is up to date'), _href=WEB2PY_URL)
     elif platform.system().lower() in ('windows', 'win32', 'win64') and os.path.exists("web2py.exe"):
         return SPAN('You should upgrade to %s' % version.split('(')[0])
@@ -249,6 +250,7 @@ def site():
                 db.app.insert(name=appname, owner=auth.user.id)
             log_progress(appname)
             session.flash = T('new application "%s" created', appname)
+            gluon.rewrite.load()
             redirect(URL('design', args=appname))
         else:
             session.flash = \
@@ -266,6 +268,7 @@ def site():
                 new_repo = git.Repo.clone_from(form_update.vars.url, target)
                 session.flash = T('new application "%s" imported',
                                   form_update.vars.name)
+                gluon.rewrite.load()
             except git.GitCommandError as err:
                 session.flash = T('Invalid git repository specified.')
             redirect(URL(r=request))
@@ -302,6 +305,7 @@ def site():
             log_progress(appname)
             session.flash = T(msg, dict(appname=appname,
                                         digest=md5_hash(installed)))
+            gluon.rewrite.load()
         else:
             msg = 'unable to install application "%(appname)s"'
             session.flash = T(msg, dict(appname=form_update.vars.name))
@@ -558,7 +562,11 @@ def enable():
         os.unlink(filename)
         return SPAN(T('Disable'), _style='color:green')
     else:
-        safe_open(filename, 'wb').write('disabled: True\ntime-disabled: %s' % request.now)
+        if PY2:
+            safe_open(filename, 'wb').write('disabled: True\ntime-disabled: %s' % request.now)
+        else:
+            str_ = 'disabled: True\ntime-disabled: %s' % request.now
+            safe_open(filename, 'wb').write(str_.encode('utf-8'))
         return SPAN(T('Enable'), _style='color:red')
 
 
@@ -638,7 +646,10 @@ def edit():
     # show settings tab and save prefernces
     if 'settings' in request.vars:
         if request.post_vars:  # save new preferences
-            post_vars = request.post_vars.items()
+            if PY2:
+                post_vars = request.post_vars.items()
+            else:
+                post_vars = list(request.post_vars.items())
             # Since unchecked checkbox are not serialized, we must set them as false by hand to store the correct preference in the settings
             post_vars += [(opt, 'false') for opt in preferences if opt not in request.post_vars]
             if config.save(post_vars):
@@ -803,8 +814,11 @@ def edit():
 
     if len(request.args) > 2 and request.args[1] == 'controllers':
         controller = (request.args[2])[:-3]
-        functions = find_exposed_functions(data)
+        try:
-        functions = functions and sorted(functions) or []
+            functions = find_exposed_functions(data)
+            functions = functions and sorted(functions) or []
+        except SyntaxError as err:
+            functions = ['SyntaxError:Line:%d' % err.lineno]
     else:
         (controller, functions) = (None, None)
 
@@ -959,8 +973,7 @@ def edit_language():
         form = SPAN(strings['__corrupted__'], _class='error')
         return dict(filename=filename, form=form)
 
-    keys = sorted(strings.keys(), lambda x, y: cmp(
+    keys = sorted(strings.keys(), key=lambda x: to_native(x).lower())
-        unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower()))
     rows = []
     rows.append(H2(T('Original/Translation')))
 
@@ -1107,7 +1120,7 @@ def design():
     defines = {}
     for m in models:
         data = safe_read(apath('%s/models/%s' % (app, m), r=request))
-        defines[m] = regex_tables.findall(data)
+        defines[m] = re.findall(REGEX_DEFINE_TABLE, data, re.MULTILINE)
         defines[m].sort()
 
     # Get all controllers
@@ -1117,8 +1130,11 @@ def design():
     functions = {}
     for c in controllers:
         data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
-        items = find_exposed_functions(data)
+        try:
-        functions[c] = items and sorted(items) or []
+            items = find_exposed_functions(data)
+            functions[c] = items and sorted(items) or []
+        except SyntaxError as err:
+            functions[c] = ['SyntaxError:Line:%d' % err.lineno]
 
     # Get all views
     views = sorted(
@@ -1128,12 +1144,12 @@ def design():
     include = {}
     for c in views:
         data = safe_read(apath('%s/views/%s' % (app, c), r=request))
-        items = regex_extend.findall(data)
+        items = re.findall(REGEX_EXTEND, data, re.MULTILINE)
 
         if items:
             extend[c] = items[0][1]
 
-        items = regex_include.findall(data)
+        items = re.findall(REGEX_INCLUDE, data)
         include[c] = [i[1] for i in items]
 
     # Get all modules
@@ -1255,8 +1271,11 @@ def plugin():
     functions = {}
     for c in controllers:
         data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
-        items = find_exposed_functions(data)
+        try:
-        functions[c] = items and sorted(items) or []
+            items = find_exposed_functions(data)
+            functions[c] = items and sorted(items) or []
+        except SyntaxError as err:
+            functions[c] = ['SyntaxError:Line:%d' % err.lineno]
 
     # Get all views
     views = sorted(
@@ -1266,11 +1285,11 @@ def plugin():
     include = {}
     for c in views:
         data = safe_read(apath('%s/views/%s' % (app, c), r=request))
-        items = regex_extend.findall(data)
+        items = re.findall(REGEX_EXTEND, data, re.MULTILINE)
         if items:
             extend[c] = items[0][1]
 
-        items = regex_include.findall(data)
+        items = re.findall(REGEX_INCLUDE, data)
         include[c] = [i[1] for i in items]
 
     # Get all modules
@@ -1861,7 +1880,6 @@ def user():
 
 def reload_routes():
     """ Reload routes.py """
-    import gluon.rewrite
     gluon.rewrite.load()
     redirect(URL('site'))
 

applications/admin/controllers/pythonanywhere.py

@@ -5,7 +5,7 @@ import re
 import gzip
 import tarfile
 from gluon.contrib.simplejsonrpc import ServerProxy
-from gluon._compat import StringIO, ProtocolError
+from gluon._compat import StringIO, ProtocolError, urlencode, urllib2
 
 def deploy():
     response.title = T('Deploy to pythonanywhere')
@@ -26,9 +26,8 @@ def create_account():
         except ProtocolError as error:
             pass
 
-    import urllib, urllib2
     url = 'https://www.pythonanywhere.com/api/web2py/create_account'
-    data = urllib.urlencode(request.vars)
+    data = urlencode(request.vars)
     req = urllib2.Request(url, data)
     
     try:

applications/admin/cron/crontab

@@ -1,2 +0,0 @@
-10	*	*	*	*	root **applications/admin/cron/expire_sessions.py
-

applications/admin/languages/af.py

@@ -16,7 +16,23 @@
 '(something like "it-it")': '(iets soos "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Soek: **%s** lêre',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'Abort': 'Abort',
 'About': 'oor',
 'About application': 'Oor program',
@@ -45,6 +61,7 @@
 'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
 'Application name:': 'Program naam:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
@@ -59,6 +76,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
 'ATTENTION: you cannot edit the running application!': 'ATTENTION: you cannot edit the running application!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available Databases and Tables': 'Available Databases and Tables',
 'back': 'back',
@@ -85,6 +103,7 @@
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'verander admin wagwoord',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'check all',
 'Check for upgrades': 'soek vir upgrades',
@@ -95,8 +114,10 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
+'Client IP': 'Client IP',
 'code': 'code',
 'Code listing': 'Code listing',
 'collapse/expand all': 'collapse/expand all',
@@ -152,6 +173,7 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'design',
 'Detailed traceback description': 'Detailed traceback description',
@@ -178,6 +200,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'aflaai plugins',
 'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
 'Edit': 'wysig',
 'edit all': 'edit all',
 'Edit application': 'Wysig program',
@@ -189,6 +212,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -225,8 +251,10 @@
 'filter': 'filter',
 'Find Next': 'Find Next',
 'Find Previous': 'Find Previous',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -241,6 +269,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'hulp',
 'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
@@ -257,11 +289,13 @@
 'Import/Export': 'Import/Export',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'includes',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'inspect attributes': 'inspect attributes',
 'Install': 'installeer',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Geinstalleerde apps',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'internal error',
@@ -270,21 +304,31 @@
 'Invalid action': 'Invalid action',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'invalid password',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Invalid Query',
 'invalid request': 'invalid request',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'invalid ticket',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
 'Language files (static strings) updated': 'Language files (static strings) updated',
 'languages': 'tale',
 'Languages': 'Tale',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Last saved on:',
 'License for': 'Lisensie vir',
@@ -298,7 +342,11 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'Login',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Login to the Administrative Interface',
 'Login/Register': 'Login/Register',
@@ -319,10 +367,12 @@
 'Modules': 'Modules',
 'modules': 'modules',
 'Multi User Mode': 'Multi User Mode',
+'Name': 'Name',
 'new application "%s" created': 'new application "%s" created',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'Nuwe app wizard',
+'New password': 'New password',
 'new plugin installed': 'new plugin installed',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'New Record',
@@ -341,6 +391,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
@@ -348,6 +400,7 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'or import from csv file',
+'Origin': 'Origin',
 'Original/Translation': 'Original/Translation',
 'Overview': 'Overview',
 'Overwrite installed app': 'skryf oor geinstalleerde program',
@@ -355,7 +408,12 @@
 'Pack compiled': 'Pack compiled',
 'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
+'Password': 'Password',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -363,6 +421,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
 'Plugin "%s" in application': 'Plugin "%s" in application',
@@ -378,6 +437,7 @@
 'previous %s rows': 'previous %s rows',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -393,19 +453,35 @@
 'Ram Cleared': 'Ram Cleared',
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'record does not exist',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Remove compiled',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Resolve Conflict file',
 'response': 'response',
 'restart': 'restart',
@@ -441,6 +517,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'site',
 'Size of cache:': 'Size of cache:',
@@ -490,7 +567,9 @@
 'There are no views': 'There are no views',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'Hierdie lêre is sonder veranderinge geserved, jou images gaan hier',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
@@ -502,6 +581,7 @@
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'to  previous version.',
 'To create a plugin, name a file/folder plugin_[name]': 'Om n plugin te skep, noem n lêer/gids plugin_[name]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -514,6 +594,7 @@
 'try something like': 'try something like',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Unable to check for upgrades',
@@ -527,6 +608,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'unable to parse csv file',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'unable to uninstall "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'uncheck all',
@@ -547,10 +629,25 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'Use an url:': 'Gebruik n url:',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Verify Password': 'Verify Password',
 'Version': 'Version',
 'Versioning': 'Versioning',
 'versioning': 'versioning',
@@ -569,14 +666,20 @@
 'web2py Recent Tweets': 'web2py Onlangse Tweets',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI reference name',
 'YES': 'YES',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/bg.py

@@ -16,7 +16,23 @@
 '(something like "it-it")': '(something like "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': 'A new version of web2py is available',
 'A new version of web2py is available: %s': 'A new version of web2py is available: %s',
 'Abort': 'Abort',
@@ -50,6 +66,7 @@
 'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
 'Application name:': 'Application name:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
@@ -66,6 +83,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
 'ATTENTION: you cannot edit the running application!': 'ATTENTION: you cannot edit the running application!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Available databases and tables',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -94,6 +112,7 @@
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'check all',
 'Check for upgrades': 'check for upgrades',
@@ -106,9 +125,11 @@
 'Clear RAM': 'Clear RAM',
 'click here for online examples': 'щракни тук за онлайн примери',
 'click here for the administrative interface': 'щракни тук за административния интерфейс',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'click to check for upgrades',
+'Client IP': 'Client IP',
 'code': 'code',
 'Code listing': 'Code listing',
 'collapse/expand all': 'collapse/expand all',
@@ -168,6 +189,7 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'дизайн',
 'DESIGN': 'DESIGN',
@@ -196,6 +218,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
 'EDIT': 'EDIT',
 'Edit': 'edit',
 'edit all': 'edit all',
@@ -211,6 +234,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -250,8 +276,10 @@
 'filter': 'filter',
 'Find Next': 'Find Next',
 'Find Previous': 'Find Previous',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -267,6 +295,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Hello World': 'Здравей, свят',
 'Help': 'help',
 'here': 'here',
@@ -285,6 +317,7 @@
 'Import/Export': 'Import/Export',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'includes',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'insert new': 'insert new',
 'insert new %s': 'insert new %s',
@@ -292,6 +325,7 @@
 'Install': 'install',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Installed applications',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'internal error',
@@ -300,15 +334,24 @@
 'Invalid action': 'Invalid action',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'invalid password',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Невалидна заявка',
 'invalid request': 'невалидна заявка',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'invalid ticket',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
@@ -316,6 +359,7 @@
 'languages': 'languages',
 'Languages': 'Languages',
 'languages updated': 'languages updated',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Last saved on:',
 'License for': 'License for',
@@ -329,8 +373,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'Login',
 'login': 'login',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Login to the Administrative Interface',
 'Login/Register': 'Login/Register',
@@ -351,10 +399,12 @@
 'Modules': 'Modules',
 'modules': 'modules',
 'Multi User Mode': 'Multi User Mode',
+'Name': 'Name',
 'new application "%s" created': 'new application "%s" created',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
+'New password': 'New password',
 'new plugin installed': 'new plugin installed',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'New Record',
@@ -374,6 +424,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
@@ -383,6 +435,7 @@
 'or import from csv file': 'or import from csv file',
 'or provide app url:': 'or provide app url:',
 'or provide application url:': 'or provide application url:',
+'Origin': 'Origin',
 'Original/Translation': 'Original/Translation',
 'Overview': 'Overview',
 'Overwrite installed app': 'overwrite installed app',
@@ -391,7 +444,12 @@
 'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
 'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
+'Password': 'Password',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -399,6 +457,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
 'Plugin "%s" in application': 'Plugin "%s" in application',
@@ -415,6 +474,7 @@
 'previous 100 rows': 'previous 100 rows',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -431,20 +491,36 @@
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
 'record': 'record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'записът не съществува',
 'record id': 'record id',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'remove compiled',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Resolve Conflict file',
 'response': 'response',
 'restart': 'restart',
@@ -483,6 +559,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'site',
 'Size of cache:': 'Size of cache:',
@@ -537,7 +614,9 @@
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'these files are served without processing, your images go here',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'This is the %(filename)s template',
@@ -550,6 +629,7 @@
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'TM': 'TM',
 'to  previous version.': 'to  previous version.',
 'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
@@ -565,6 +645,7 @@
 'try something like': 'try something like',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Unable to check for upgrades',
@@ -580,6 +661,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'не е възможна обработката на csv файла',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'unable to uninstall "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'uncheck all',
@@ -603,10 +685,25 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'Use an url:': 'Use an url:',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Verify Password': 'Verify Password',
 'Version': 'Version',
 'Versioning': 'Versioning',
 'versioning': 'versioning',
@@ -626,6 +723,7 @@
 'web2py Recent Tweets': 'web2py Recent Tweets',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome to web2py': 'Добре дошъл в web2py',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI reference name',
@@ -633,8 +731,13 @@
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/cs.py

@@ -19,8 +19,23 @@
 '(something like "it-it")': '(například "cs-cs")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(soubor **gluon/contrib/plural_rules/%s.py** nenalezen)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Hledání: **%s** %%{soubor}',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'Abort': 'Abort',
 'About': 'O programu',
 'About application': 'O aplikaci',
@@ -54,6 +69,7 @@
 'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
 'Application name:': 'Název aplikace:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'nepoužita',
 'are not used yet': 'ještě nepoužita',
 'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
@@ -68,6 +84,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
 'ATTENTION: you cannot edit the running application!': 'ATTENTION: you cannot edit the running application!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available Databases and Tables': 'Dostupné databáze a tabulky',
 'back': 'zpět',
@@ -107,6 +124,7 @@
 'Clear CACHE?': 'Vymazat CACHE?',
 'Clear DISK': 'Vymazat DISK',
 'Clear RAM': 'Vymazat RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 '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',
@@ -220,6 +238,9 @@
 'Editor': 'Editor',
 'Email Address': 'Email Address',
 'Email and SMS': 'Email a SMS',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Odblokovat',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -268,6 +289,7 @@
 'Forms and Validators': 'Formuláře a validátory',
 'Frames': 'Frames',
 'Free Applications': 'Aplikace zdarma',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -284,7 +306,9 @@
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
 'Group %(group_id)s created': 'Skupina %(group_id)s vytvořena',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'ID skupiny',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Groups': 'Skupiny',
 'Hello World': 'Ahoj světe',
 'Help': 'Nápověda',
@@ -304,6 +328,7 @@
 'Import/Export': 'Import/Export',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'zahrnuje',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'Index': 'Index',
 'insert new': 'vložit nový záznam ',
@@ -312,6 +337,7 @@
 'Install': 'Instalovat',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Nainstalované aplikace',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interakce v %s, na řádce %s',
 'Interactive console': 'Interaktivní příkazová řádka',
 'internal error': 'internal error',
@@ -323,19 +349,26 @@
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'Neplatný email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'Invalid password': 'Nesprávné heslo',
 'invalid password': 'invalid password',
 'invalid password.': 'neplatné heslo',
 'Invalid Query': 'Neplatný dotaz',
 'invalid request': 'Neplatný požadavek',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'invalid ticket',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 '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',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
@@ -361,10 +394,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Lokální proměnné',
+'Log In': 'Log In',
 '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 disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Přihlásit se do Správce aplikací',
 'Login/Register': 'Login/Register',
@@ -442,7 +477,10 @@
 'Password': 'Heslo',
 'password': 'heslo',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
 "Password fields don't match": 'Hesla se neshodují',
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -450,6 +488,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Prosím',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
 'Plugin "%s" in application': 'Plugin "%s" in application',
@@ -468,6 +507,7 @@
 'Private files': 'Soukromé soubory',
 'private files': 'soukromé soubory',
 'profile': 'profil',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Vývoj projektu',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -487,14 +527,24 @@
 'Readme': 'Nápověda',
 'Recipes': 'Postupy jak na to',
 'Record': 'Záznam',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'záznam neexistuje',
 'Record ID': 'ID záznamu',
 'Record id': 'id záznamu',
+'Record Updated': 'Record Updated',
 'refresh': 'obnovte',
 'register': 'registrovat',
 'Register': 'Zaregistrovat se',
 'Registration identifier': 'Registrační identifikátor',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Registrační klíč',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'reload': 'reload',
 'Reload routes': 'Znovu nahrát cesty',
 'Remember me (for 30 days)': 'Zapamatovat na 30 dní',
@@ -504,6 +554,7 @@
 'Replace All': 'Zaměnit vše',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
 'Reset Password key': 'Reset registračního klíče',
@@ -545,6 +596,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Bod přerušení nastaven v souboru %s na řádce %s: %s',
 'shell': 'příkazová řádka',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'Správa aplikací',
 'Size of cache:': 'Velikost cache:',
@@ -601,7 +653,9 @@
 '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 code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 '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 downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
@@ -630,6 +684,7 @@
 'Try the mobile interface': 'Zkuste rozhraní pro mobilní zařízení',
 'try view': 'try view',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type 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.',
@@ -644,6 +699,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'csv soubor nedá sa zpracovat',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'unable to uninstall "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'vše odznačit',
@@ -663,14 +719,21 @@
 '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': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
 '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 Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
 '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)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'ID uživatele',
 'Username': 'Přihlašovací jméno',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
@@ -696,6 +759,7 @@
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
 'Welcome': 'Vítejte',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 '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.',
@@ -708,9 +772,14 @@
 'You can inspect variables using the console bellow': 'Níže pomocí příkazové řádky si můžete prohlédnout proměnné',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
 'You can modify this application and adapt it to your needs': 'Tuto aplikaci si můžete upravit a přizpůsobit ji svým potřebám.',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'Je třeba nejprve nastavit a dojít až na',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 '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 password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/en.py

@@ -15,6 +15,23 @@
 '(something like "it-it")': '(something like "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** %%{file}',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'Abort': 'Abort',
 'About': 'About',
 'About application': 'About application',
@@ -43,6 +60,7 @@
 'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
 'Application name:': 'Application name:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
@@ -57,6 +75,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
 'ATTENTION: you cannot edit the running application!': 'ATTENTION: you cannot edit the running application!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available Databases and Tables': 'Available Databases and Tables',
 'back': 'back',
@@ -83,6 +102,7 @@
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Change admin password',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'check all',
 'Check for upgrades': 'Check for upgrades',
@@ -93,8 +113,10 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
+'Client IP': 'Client IP',
 'code': 'code',
 'Code listing': 'Code listing',
 'collapse/expand all': 'collapse/expand all',
@@ -150,6 +172,7 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'design',
 'Detailed traceback description': 'Detailed traceback description',
@@ -176,6 +199,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
 'Edit': 'Edit',
 'edit all': 'edit all',
 'Edit application': 'Edit application',
@@ -187,6 +211,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -223,8 +250,10 @@
 'filter': 'filter',
 'Find Next': 'Find Next',
 'Find Previous': 'Find Previous',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -239,6 +268,10 @@
 'Goto': 'Goto',
 'Graph Model': 'Graph Model',
 'graph model': 'graph model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'Help',
 'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
@@ -255,11 +288,13 @@
 'Import/Export': 'Import/Export',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'includes',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'inspect attributes': 'inspect attributes',
 'Install': 'Install',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Installed applications',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'internal error',
@@ -268,21 +303,31 @@
 'Invalid action': 'Invalid action',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'invalid password',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Invalid Query',
 'invalid request': 'invalid request',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'invalid ticket',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
 'Language files (static strings) updated': 'Language files (static strings) updated',
 'languages': 'languages',
 'Languages': 'Languages',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Last saved on:',
 'License for': 'License for',
@@ -295,7 +340,11 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'Login',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Login to the Administrative Interface',
 'Login/Register': 'Login/Register',
@@ -316,10 +365,12 @@
 'Modules': 'Modules',
 'modules': 'modules',
 'Multi User Mode': 'Multi User Mode',
+'Name': 'Name',
 'new application "%s" created': 'new application "%s" created',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
+'New password': 'New password',
 'new plugin installed': 'new plugin installed',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'New Record',
@@ -338,6 +389,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
@@ -345,6 +398,7 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'or import from csv file',
+'Origin': 'Origin',
 'Original/Translation': 'Original/Translation',
 'Overview': 'Overview',
 'Overwrite installed app': 'Overwrite installed app',
@@ -352,7 +406,12 @@
 'Pack compiled': 'Pack compiled',
 'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
+'Password': 'Password',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -360,6 +419,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
 'Plugin "%s" in application': 'Plugin "%s" in application',
@@ -375,6 +435,7 @@
 'previous %s rows': 'previous %s rows',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -390,19 +451,35 @@
 'Ram Cleared': 'Ram Cleared',
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'record does not exist',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Remove compiled',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Resolve Conflict file',
 'response': 'response',
 'restart': 'restart',
@@ -438,6 +515,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'Site',
 'Size of cache:': 'Size of cache:',
@@ -486,7 +564,9 @@
 'There are no views': 'There are no views',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
@@ -498,6 +578,7 @@
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'to  previous version.',
 'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -510,6 +591,7 @@
 'try something like': 'try something like',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Unable to check for upgrades',
@@ -523,6 +605,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'unable to parse csv file',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'unable to uninstall "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'uncheck all',
@@ -541,10 +624,25 @@
 'upload plugin file:': 'upload plugin file:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Verify Password': 'Verify Password',
 'Version': 'Version',
 'Versioning': 'Versioning',
 'Views': 'Views',
@@ -561,14 +659,20 @@
 'web2py online debugger': 'web2py online debugger',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI reference name',
 'YES': 'YES',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/es.py

@@ -15,10 +15,23 @@
 '(something like "it-it")': '(algo como "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(archivo **gluon/contrib/plural_rules/%s.py** no se ha encontrado)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'Ocurrió un error, por favor [[recargue %s]] la página',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
 '@markmin\x01Number of entries: **%s**': 'Número de entradas: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Buscando: **%s** archivos',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 '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',
 'Abort': 'Abort',
@@ -54,6 +67,7 @@
 'application is compiled and cannot be designed': 'la aplicación está compilada y no puede ser modificada',
 'Application name:': 'Nombre de la aplicación:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 '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"?',
@@ -70,6 +84,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENCIÓN: Inicio de sesión requiere una conexión segura (HTTPS) o localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENCIÓN: NO EJECUTE VARIAS PRUEBAS SIMULTANEAMENTE, NO SON THREAD SAFE.',
 'ATTENTION: you cannot edit the running application!': 'ATENCIÓN: ¡no puede modificar la aplicación que se ejecuta!',
+'Authentication code': 'Authentication code',
 'Autocomplete': 'Autocompletar',
 'Autocomplete Python Code': 'Autocompletar código Python',
 'Available databases and tables': 'Bases de datos y tablas disponibles',
@@ -101,6 +116,7 @@
 'Change admin password': 'cambie contraseña admin',
 'change editor settings': 'cambiar la configuración del editor',
 'Change Password': 'Cambie Contraseña',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'marcar todos',
 'Check for upgrades': 'buscar actualizaciones',
@@ -113,6 +129,7 @@
 'Clear RAM': 'Limpiar RAM',
 'click here for online examples': 'haga click aquí para ver ejemplos en línea',
 'click here for the administrative interface': 'haga click aquí para usar la interfaz administrativa',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click en la fila para expandir el rastreo',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'haga clic para buscar actualizaciones',
@@ -233,6 +250,9 @@
 'Editing ul': 'Editando ul',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Habilitar',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -277,6 +297,7 @@
 'First name': 'Nombre',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -291,7 +312,10 @@
 'Goto': 'Goto',
 'graph model': 'graficación del modelo',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'ID de Grupo',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Hello World': 'Hola Mundo',
 'Help': 'ayuda',
 'here': 'aquí',
@@ -311,6 +335,7 @@
 'Import/Export': 'Importar/Exportar',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'incluye',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'insert new': 'inserte nuevo',
 'insert new %s': 'inserte nuevo %s',
@@ -319,6 +344,7 @@
 'Installation of %(plugin)s for %(app)s': 'Instalación de %(plugin)s para %(app)s',
 'Installation of %(plugin)s for %(app)s app': 'Instalación de %(plugin)s para %(app)s app',
 'Installed applications': 'Aplicaciones instaladas',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interacción en %s línea %s',
 'Interactive console': 'Terminal interactiva',
 'internal error': 'error interno',
@@ -329,16 +355,24 @@
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'Correo inválido',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'contraseña inválida',
+'Invalid password': 'Invalid password',
 'invalid password.': 'contraseña inválida.',
 'Invalid Query': 'Consulta inválida',
 'invalid request': 'solicitud inválida',
 'Invalid request': 'Petición inválida',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'tiquete inválido',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
 'Key bindings': 'Key bindings',
 'Key bindings for ZenCoding Plugin': 'Key bindings para el Plugin ZenCoding',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Atajos de teclado',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'archivo de lenguaje "%(filename)s" creado/actualizado',
@@ -360,8 +394,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'login': 'inicio de sesión',
 'Login': 'Inicio de sesión',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Inicio de sesión para la Interfaz Administrativa',
 'Login/Register': 'Login/Register',
@@ -389,6 +427,7 @@
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'Asistente para nueva aplicación',
+'New password': 'New password',
 'new plugin installed': 'nuevo plugin instalado',
 'New plugin installed: %s': 'Nuevo plugin instalado: %s',
 'New plugin installed: web2py.plugin.attachment.w2p': 'Nuevo plugin instalado: web2py.plugin.attachment.w2p',
@@ -413,6 +452,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'diseñador en línea',
 'Open new app in new window': 'Open new app in new window',
@@ -434,6 +475,10 @@
 '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',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -441,6 +486,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Por favor',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'Plugin': 'Plugin',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" eliminado',
@@ -458,6 +504,7 @@
 'previous 100 rows': '100 filas anteriores',
 'Private files': 'Archivos privados',
 'private files': 'archivos privados',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Progreso del  Proyecto',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -474,16 +521,28 @@
 'Rapid Search': 'Búsqueda rápida',
 'Record': 'Record',
 'record': 'registro',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'el registro no existe',
 'record id': 'id de registro',
 'Record ID': 'ID de Registro',
 'Record id': 'Record id',
+'Record Updated': 'Record Updated',
 'refresh': 'recargar',
 'register': 'register',
 'Register': 'Regístrese',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Contraseña de Registro',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'reload': 'recargar',
 'Reload routes': 'Recargar rutas',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'eliminar compilados',
 'Removed Breakpoint on %s at line %s': 'Eliminado punto de ruptura en %s en la línea %s',
 'Replace': 'Reemplazar',
@@ -491,8 +550,10 @@
 'Repository (%s)': 'Repositorio (%s)',
 'Repository: %s': 'Repositorio: %s',
 'request': 'petición',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'archivo Resolución de Conflicto',
 'response': 'respuesta',
 'restart': 'restart',
@@ -532,6 +593,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Establecer punto de ruptura en %s en la línea %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'sitio',
 'Size of cache:': 'Size of cache:',
@@ -588,7 +650,9 @@
 'These files are not served, they are only available from within your app': 'Estos archivos no se proveen, ellos sólo están disponibles para su aplicación',
 'These files are served without processing, your images go here': 'Estos archivos se proveen sin procesar, sus imágenes van aquí',
 'these files are served without processing, your images go here': 'estos archivos se proveen sin procesar, sus imágenes van aquí',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'Está es la plantilla %(filename)s',
@@ -617,6 +681,7 @@
 'try something like': 'intente algo como',
 'Try the mobile interface': 'Pruebe la interfaz móvil',
 'try view': 'Pruebe la vista',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Escriba algún código Python aquí y teclee la tecla Enter para ejecutarlo',
 'Unable to check for upgrades': 'No es posible verificar la existencia de actualizaciones',
@@ -633,6 +698,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'no es posible analizar el archivo CSV',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'no es posible instalar "%s"',
 'unable to upgrade because "%s"': 'no es posible actualizar porque "%s"',
 'uncheck all': 'desmarcar todos',
@@ -655,11 +721,25 @@
 'upload plugin file:': 'suba un archivo de plugin:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, y ~(...) para NOT, para crear consultas más complejas.',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'ID de Usuario',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Verify Password': 'Verify Password',
 'Version': 'Versión',
 'Versioning': 'Versiones',
 'versioning': 'versiones',
@@ -679,6 +759,7 @@
 'web2py Recent Tweets': 'Tweets Recientes de web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py actualizado; favor reiniciar',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome to web2py': 'Bienvenido a web2py',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI reference name',
@@ -687,8 +768,13 @@
 'You are going to install': 'Vas a instalar',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'Puedes inspeccionar las variables utilizando la terminal de abajo',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'Necesitas configurar y obtener un',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Tu aplicación será bloqueada hasta que des click en un botón de acción (siguiente, paso, continuar, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/fr.py

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

applications/admin/languages/he.py

@@ -16,7 +16,23 @@
 '(something like "it-it")': '(למשל "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available: %s': 'גירסא חדשה של web2py זמינה: %s',
 'Abort': 'Abort',
 'About': 'אודות',
@@ -48,6 +64,7 @@
 'application is compiled and cannot be designed': 'לא ניתן לערוך אפליקציה מקומפלת',
 'Application name:': 'Application name:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'האם אתה בטוח שברצונך למחוק את הקובץ "%s"?',
@@ -63,6 +80,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'לתשומת ליבך: ניתן להתחבר רק בערוץ מאובטח (HTTPS) או מlocalhost',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'לתשומת ליבך: אין לערוך מספר בדיקות במקביל, שכן הן עשויות להפריע זו לזו',
 'ATTENTION: you cannot edit the running application!': 'לתשומת ליבך: לא ניתן לערוך אפליקציה בזמן הרצתה',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'מסדי נתונים וטבלאות זמינים',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -90,6 +108,7 @@
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'סיסמת מנהל שונתה',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'סמן הכל',
 'Check for upgrades': 'check for upgrades',
@@ -100,9 +119,11 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'לחץ כדי לחפש עדכונים',
+'Client IP': 'Client IP',
 'code': 'קוד',
 'Code listing': 'Code listing',
 'collapse/expand all': 'collapse/expand all',
@@ -162,6 +183,7 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'עיצוב',
 'Detailed traceback description': 'Detailed traceback description',
@@ -188,6 +210,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
 'EDIT': 'ערוך!',
 'Edit': 'ערוך',
 'edit all': 'edit all',
@@ -202,6 +225,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -239,8 +265,10 @@
 'filter': 'filter',
 'Find Next': 'Find Next',
 'Find Previous': 'Find Previous',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'פונקציות שלא הוגדר להן doctest ירשמו כבדיקות ש[עברו בהצלחה].',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -255,6 +283,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'עזרה',
 'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
@@ -272,6 +304,7 @@
 'Import/Export': 'יבא\\יצא',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'מכיל',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'insert new': 'הכנס נוסף',
 'insert new %s': 'הכנס %s נוסף',
@@ -279,6 +312,7 @@
 'Install': 'התקן',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'אפליקציות מותקנות',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'שגיאה מובנית',
@@ -287,21 +321,31 @@
 'Invalid action': 'הוראה לא קיימת',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'סיסמא שגויה',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'שאילתה לא תקינה',
 'invalid request': 'בקשה לא תקינה',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'דו"ח שגיאה לא קיים',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'קובץ השפה "%(filename)s" נוצר\\עודכן',
 'Language files (static strings) updated': 'קובץ השפה (מחרוזות סטאטיות) עודכן',
 'languages': 'שפות',
 'Languages': 'שפות',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'לאחרונה נשמר בתאריך:',
 'License for': 'רשיון עבור',
@@ -315,8 +359,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'התחבר',
 'login': 'התחבר',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'התחבר לממשק המנהל',
 'Login/Register': 'Login/Register',
@@ -337,10 +385,12 @@
 'Modules': 'מודולים',
 'modules': 'מודולים',
 'Multi User Mode': 'Multi User Mode',
+'Name': 'Name',
 'new application "%s" created': 'האפליקציה "%s" נוצרה',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
+'New password': 'New password',
 'new plugin installed': 'פלאגין חדש הותקן',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'רשומה חדשה',
@@ -360,6 +410,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
@@ -368,6 +420,7 @@
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'או יבא מקובץ csv',
 'or provide app url:': 'או ספק כתובת url של אפליקציה',
+'Origin': 'Origin',
 'Original/Translation': 'מקור\\תרגום',
 'Overview': 'Overview',
 'Overwrite installed app': 'התקן על גבי אפלקציה מותקנת',
@@ -376,7 +429,12 @@
 'Pack custom': 'Pack custom',
 'pack plugin': 'ארוז תוסף',
 'PAM authenticated user, cannot change password here': 'שינוי סיסמא באמצעות PAM אינו יכול להתבצע כאן',
+'Password': 'Password',
 'password changed': 'סיסמא שונתה',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -384,6 +442,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'תוסף "%(plugin)s" נמחק',
 'Plugin "%s" in application': 'פלאגין "%s" של אפליקציה',
@@ -400,6 +459,7 @@
 'previous 100 rows': '100 הרשומות הקודמות',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -416,20 +476,36 @@
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
 'record': 'רשומה',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'הרשומה אינה קיימת',
 'record id': 'מזהה רשומה',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'הסר מקומפל',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'הסר קובץ היוצר קונפליקט',
 'response': 'response',
 'restart': 'restart',
@@ -467,6 +543,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'שורת פקודה',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'אתר',
 'Size of cache:': 'Size of cache:',
@@ -521,7 +598,9 @@
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'אלו הם קבצים הנשלחים מהשרת ללא עיבוד. הכנס את התמונות כאן',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'זוהי תבנית הקובץ %(filename)s ',
@@ -534,6 +613,7 @@
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'TM': 'סימן רשום',
 'to  previous version.': 'אין גירסא קודמת',
 'To create a plugin, name a file/folder plugin_[name]': 'כדי ליצור תוסף, קרא לקובץ או סיפריה בשם לפי התבנית plugin_[name]',
@@ -549,6 +629,7 @@
 'try something like': 'נסה משהו כמו',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'לא ניתן היה לבדוק אם יש שדרוגים',
@@ -563,6 +644,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'לא הצלחתי לנתח את הקלט של קובץ csv',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'לא ניתן להסיר את "%s"',
 'unable to upgrade because "%s"': 'לא ניתן היה לשדרג כי "%s"',
 'uncheck all': 'הסר סימון מהכל',
@@ -586,10 +668,25 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'השתמש ב (...)&(...) עבור תנאי AND, (...)|(...) עבור תנאי OR ו~(...) עבור תנאי NOT ליצירת שאילתות מורכבות',
 'Use an url:': 'Use an url:',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'משתנים',
+'Verify Password': 'Verify Password',
 'Version': 'גירסא',
 'Versioning': 'Versioning',
 'versioning': 'מנגנון גירסאות',
@@ -609,14 +706,20 @@
 'web2py Recent Tweets': 'ציוצים אחרונים של web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py שודרגה; נא אתחל אותה',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI reference name',
 'YES': 'כן',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/it.py

@@ -16,9 +16,23 @@
 '(something like "it-it")': '(qualcosa simile a "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available: %s': 'È disponibile una nuova versione di web2py: %s',
 'Abort': 'Abort',
 'About': 'informazioni',
@@ -51,6 +65,7 @@
 'application is compiled and cannot be designed': "l'applicazione è compilata e non si può modificare",
 'Application name:': 'Application name:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 '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"?',
@@ -66,6 +81,7 @@
 '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 ",
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Database e tabelle disponibili',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -94,6 +110,7 @@
 'Change admin password': 'change admin password',
 'change editor settings': 'change editor settings',
 'change password': 'cambia password',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'controlla tutto',
 'Check for upgrades': 'check for upgrades',
@@ -106,9 +123,11 @@
 'Clear RAM': 'Clear RAM',
 'click here for online examples': 'clicca per vedere gli esempi',
 'click here for the administrative interface': "clicca per l'interfaccia amministrativa",
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'clicca per controllare presenza di aggiornamenti',
+'Client IP': 'Client IP',
 'code': 'code',
 'Code listing': 'Code listing',
 'collapse/expand all': 'collapse/expand all',
@@ -172,6 +191,7 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'progetta',
 'Detailed traceback description': 'Detailed traceback description',
@@ -198,6 +218,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
 'EDIT': 'MODIFICA',
 'Edit': 'modifica',
 'edit all': 'edit all',
@@ -213,9 +234,13 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
+'Enter an integer between %(min)g and %(max)g': 'Enter an integer between %(min)g and %(max)g',
 'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Log degli errori per "%(app)s"',
@@ -251,8 +276,10 @@
 'filter': 'filter',
 'Find Next': 'Find Next',
 'Find Previous': 'Find Previous',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'I test delle funzioni senza "doctests" risulteranno sempre [passed].',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -268,6 +295,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Hello World': 'Salve Mondo',
 'Help': 'aiuto',
 'here': 'here',
@@ -286,6 +317,7 @@
 'Import/Export': 'Importa/Esporta',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'include',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'Index': 'Indice',
 'insert new': 'inserisci nuovo',
@@ -294,6 +326,7 @@
 'Install': 'installa',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Applicazioni installate',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'errore interno',
@@ -302,23 +335,33 @@
 'Invalid action': 'Azione non valida',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'password non valida',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Richiesta (query) non valida',
 'invalid request': 'richiesta non valida',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'ticket non valido',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
 'Key bindings': 'Key bindings',
 'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'file linguaggio "%(filename)s" creato/aggiornato',
 'Language files (static strings) updated': 'Linguaggi (documenti con stringhe statiche) aggiornati',
 'languages': 'linguaggi',
 'Languages': 'Linguaggi',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Ultimo salvataggio:',
 'Layout': 'Layout',
@@ -333,8 +376,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'Accesso',
 'login': 'accesso',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': "Accesso all'interfaccia amministrativa",
 'Login/Register': 'Login/Register',
@@ -356,10 +403,12 @@
 'Modules': 'Moduli',
 'modules': 'moduli',
 'Multi User Mode': 'Multi User Mode',
+'Name': 'Name',
 'new application "%s" created': 'creata la nuova applicazione "%s"',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
+'New password': 'New password',
 'new plugin installed': 'installato nuovo plugin',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Nuovo elemento (record)',
@@ -379,6 +428,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'online designer',
 'Open new app in new window': 'Open new app in new window',
@@ -388,6 +439,7 @@
 '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:",
+'Origin': 'Origin',
 'Original/Translation': 'Originale/Traduzione',
 'Overview': 'Overview',
 'Overwrite installed app': 'sovrascrivi applicazione installata',
@@ -396,7 +448,12 @@
 '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': 'Password',
 'password changed': 'password modificata',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -404,6 +461,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" cancellato',
 'Plugin "%s" in application': 'Plugin "%s" nell\'applicazione',
@@ -420,6 +478,7 @@
 'previous 100 rows': '100 righe precedenti',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -436,21 +495,37 @@
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
 'record': 'record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'il record non esiste',
 'record id': 'ID del record',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'registrazione',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'reload': 'reload',
 'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'rimozione codice compilato',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'File di risoluzione conflitto',
 'response': 'response',
 'restart': 'restart',
@@ -488,6 +563,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'sito',
 'Size of cache:': 'Size of cache:',
@@ -543,7 +619,9 @@
 '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 code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'Questo è il template %(filename)s',
@@ -556,6 +634,7 @@
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 '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]',
@@ -571,6 +650,7 @@
 'try something like': 'prova qualcosa come',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Impossibile controllare presenza di aggiornamenti',
@@ -586,6 +666,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'non riesco a decodificare questo file CSV',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'impossibile disinstallare "%s"',
 'unable to upgrade because "%s"': 'impossibile aggiornare perché "%s"',
 'uncheck all': 'smarca tutti',
@@ -608,10 +689,25 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Per costruire richieste (query) più complesse si usano (...)&(...) come "e" (AND), (...)|(...) come "o" (OR), e ~(...) come negazione (NOT).',
 'Use an url:': 'Use an url:',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Verify Password': 'Verify Password',
 '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',
@@ -634,6 +730,7 @@
 'web2py Recent Tweets': 'Tweets recenti per web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py aggiornato; prego riavviarlo',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome %s': 'Benvenuto %s',
 'Welcome to web2py': 'Benvenuto su web2py',
 'Working...': 'Working...',
@@ -642,8 +739,13 @@
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/ja.py

@@ -16,8 +16,23 @@
 '(something like "it-it")': '(例: "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': '検索中: **%s** ファイル',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'Abort': '中断',
 'About': 'About',
 'About application': 'アプリケーションについて',
@@ -46,6 +61,7 @@
 'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
 'Application name:': 'アプリケーション名:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
@@ -60,6 +76,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': '注意: 安全(HTTPS)な接続でログインするかlocalhostで実行されている必要があります。',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': '注意: テストはスレッドセーフではないので複数のテストを同時に実行しないでください。',
 'ATTENTION: you cannot edit the running application!': '注意: 実行中のアプリケーションは編集できません!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': '利用可能なデータベースとテーブル一覧',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -87,6 +104,7 @@
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': '管理者パスワード変更',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': '全てを選択',
 'Check for upgrades': '更新チェック',
@@ -97,8 +115,10 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': '列をクリックしてトレースバックを展開',
 'Click row to view a ticket': 'Click row to view a ticket',
+'Client IP': 'Client IP',
 'code': 'コード',
 'Code listing': 'Code listing',
 'collapse/expand all': '全て開閉する',
@@ -128,7 +148,7 @@
 'Current response': 'Current response',
 'Current session': 'Current session',
 'currently running': '現在実行中',
-'currently saved or': '現在保存されているデータ　または',
+'currently saved or': '現在保存されているデータ\u3000または',
 'data uploaded': 'data uploaded',
 'Database': 'Database',
 'Database %s select': 'Database %s select',
@@ -154,6 +174,7 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'デザイン',
 'Detailed traceback description': '詳細なトレースバック内容',
@@ -180,6 +201,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'プラグインのダウンロード',
 'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
 'Edit': '編集',
 'edit all': '全て編集',
 'Edit application': 'アプリケーションを編集',
@@ -192,6 +214,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': '有効',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -228,8 +253,10 @@
 'filter': 'フィルタ',
 'Find Next': 'Find Next',
 'Find Previous': 'Find Previous',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'フレーム',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'doctestsのない関数は自動的にテストをパスします。',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -245,6 +272,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'ヘルプ',
 'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
@@ -261,12 +292,14 @@
 'Import/Export': 'Import/Export',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'インクルード',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'index': 'index',
 'inspect attributes': '引数の検査',
 'Install': 'インストール',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'アプリケーション一覧',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'internal error',
@@ -275,21 +308,31 @@
 'Invalid action': 'Invalid action',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'invalid password',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Invalid Query',
 'invalid request': 'invalid request',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'invalid ticket',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
 'Language files (static strings) updated': 'Language files (static strings) updated',
 'languages': '言語',
 'Languages': '言語',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': '最終保存日時:',
 'License for': 'License for',
@@ -303,7 +346,11 @@
 'Local Apps': 'Local Apps',
 'locals': 'ローカル',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'ログイン',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': '管理画面へログイン',
 'Login/Register': 'Login/Register',
@@ -324,10 +371,12 @@
 'Modules': 'モジュール',
 'modules': 'モジュール',
 'Multi User Mode': 'Multi User Mode',
+'Name': 'Name',
 'new application "%s" created': 'new application "%s" created',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': '新規アプリケーション作成ウィザード',
 'New application wizard': '新規アプリケーション作成ウィザード',
+'New password': 'New password',
 'new plugin installed': '新しいプラグインがインストールされました',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'New Record',
@@ -346,6 +395,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'オンラインデザイナー',
 'Open new app in new window': 'Open new app in new window',
@@ -354,6 +405,7 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'or import from csv file',
+'Origin': 'Origin',
 'Original/Translation': 'Original/Translation',
 'Overview': 'Overview',
 'Overwrite installed app': 'アプリケーションを上書き',
@@ -361,7 +413,12 @@
 'Pack compiled': 'コンパイルデータのパッケージ化',
 'Pack custom': 'Pack custom',
 'pack plugin': 'プラグインのパッケージ化',
+'Password': 'Password',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -369,6 +426,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': '"%(plugin)s"プラグインは削除されました',
 'Plugin "%s" in application': '"%s"プラグイン',
@@ -384,6 +442,7 @@
 'previous %s rows': 'previous %s rows',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -399,19 +458,35 @@
 'Ram Cleared': 'Ram Cleared',
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'record does not exist',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'ルーティング再読み込み',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'コンパイルデータの削除',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'リクエスト',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Resolve Conflict file',
 'response': 'レスポンス',
 'restart': '最初からやり直し',
@@ -447,6 +522,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'サイト',
 'Size of cache:': 'Size of cache:',
@@ -495,7 +571,9 @@
 'There are no views': 'ビューがありません',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'これらのファイルは直接参照されます, ここに画像が入ります',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
@@ -507,6 +585,7 @@
 'Ticket ID': 'チケットID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'to  previous version.': '前のバージョンへ戻す。',
 'To create a plugin, name a file/folder plugin_[name]': 'ファイル名/フォルダ名 plugin_[名称]としてプラグインを作成してください',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -519,6 +598,7 @@
 'try something like': 'try something like',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Unable to check for upgrades',
@@ -533,6 +613,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'unable to parse csv file',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'unable to uninstall "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': '全ての選択を解除',
@@ -552,10 +633,25 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'user': 'ユーザー',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': '変数',
+'Verify Password': 'Verify Password',
 'Version': 'バージョン',
 'Versioning': 'バージョン管理',
 'Views': 'ビュー',
@@ -573,14 +669,20 @@
 'web2py Recent Tweets': '最近のweb2pyTweets',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI reference name',
 'YES': 'はい',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/my-mm.py

@@ -15,7 +15,23 @@
 '(something like "it-it")': '(something like "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** %%{file}',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'Abort': 'Abort',
 'About': 'အကြောင်း',
 'About application': 'About application',
@@ -47,6 +63,7 @@
 'application is compiled and cannot be designed': 'application is compiled and cannot be designed',
 'Application name:': 'Application name:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'အသုံးမပြုပါ',
 'are not used yet': 'အသုံးမပြုသေးပါ',
 'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
@@ -61,6 +78,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
 'ATTENTION: you cannot edit the running application!': 'ATTENTION: you cannot edit the running application!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available Databases and Tables': 'အသုံးပြုနိုင်သော ဒေတာဘေစ့်များနှင့် ဇယားများ',
 'back': 'back',
@@ -88,6 +106,7 @@
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Change admin password',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'check all',
 'Check for upgrades': 'Check for upgrades',
@@ -98,6 +117,7 @@
 'Clear CACHE?': 'CACHE ကို ရှင်းလင်းမည်မှာ ဟုတ်ပါသလား။',
 'Clear DISK': 'DISK ကို ရှင်းလင်းမည်။',
 'Clear RAM': 'RAM ကို ရှင်းလင်းမည်။',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
 'Client IP': 'Client IP',
@@ -206,6 +226,9 @@
 'Editor': 'Editor',
 'Email Address': 'Email Address',
 'Email and SMS': 'အီးမေးလ်နှင့် SMS',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'ဖွင့်ရန်',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -249,6 +272,7 @@
 'Forms and Validators': 'Forms and Validators',
 'Frames': 'Frames',
 'Free Applications': 'အခမဲ့ Applications',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -263,7 +287,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Groups': 'အဖွဲ့များ',
 'Hello World': 'မင်္ဂလာပါ ကမ္ဘာကြီး။',
 'Help': 'အကူအညီ',
@@ -283,11 +310,13 @@
 'Import/Export': 'သွင်းယူရန်/ထုတ်ယူရန်',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'includes',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'inspect attributes': 'inspect attributes',
 'Install': 'Install',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'ထည့်သွင်းပြီး application များ',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'internal error',
@@ -299,15 +328,23 @@
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'အီးမေးလ် ဖြည့်သွင်းမှုမှားနေသည်',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'invalid password',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Invalid Query',
 'invalid request': 'invalid request',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'invalid ticket',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Is Active': 'Is Active',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'Language': 'ဘာသာစကား',
@@ -332,7 +369,11 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'ဝင်ရောက်အသုံးပြုရန်',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Login to the Administrative Interface',
 'Login/Register': 'Login/Register',
@@ -363,6 +404,7 @@
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
+'New password': 'New password',
 'new plugin installed': 'new plugin installed',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'မှတ်တမ်း အသစ်',
@@ -382,6 +424,7 @@
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
 'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Online examples': 'အွန်လိုင်း နမူနာများ',
 'Open new app in new window': 'Open new app in new window',
@@ -402,7 +445,10 @@
 'pack plugin': 'pack plugin',
 'Password': 'စကားဝှက်',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
 "Password fields don't match": 'စကားဝှက်များ ကိုက်ညီမှု မရှိပါ',
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -427,6 +473,7 @@
 'previous %s rows': 'previous %s rows',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -445,14 +492,24 @@
 'Rapid Search': 'Rapid Search',
 'Recipes': 'Recipes',
 'Record': 'မှတ်တမ်း',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'မှတ်တမ်း မရှိပါ',
 'Record ID': 'Record ID',
 'Record id': 'Record id',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
 'Register': 'မှတ်ပုံတင်ရန်',
 'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
 'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Remove compiled',
@@ -502,6 +559,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'Site',
 'Size of cache:': 'Size of cache:',
@@ -556,6 +614,7 @@
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'This App': 'ဒီ App',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
 'This email already has an account': 'ဒီအီးမေးလ်တွင် အကောင့် ရှိပြီး ဖြစ်ပါသည်',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
@@ -583,6 +642,7 @@
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Unable to check for upgrades',
@@ -596,6 +656,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'unable to parse csv file',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'unable to uninstall "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'uncheck all',
@@ -614,8 +675,21 @@
 'upload plugin file:': 'upload plugin file:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'User': 'အသုံးပြုသူ',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'အသုံးပြုသူများ',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
@@ -639,6 +713,7 @@
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
 'Welcome': 'ကြိုဆိုပါ၏',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome to web2py!': 'web2py မှ ကြိုဆိုပါသည်။',
 'Which called the function %s located in the file %s': 'Which called the function %s located in the file %s',
 'Working...': 'ဆောင်ရွက်နေပါသည် ။ ။ ။',
@@ -649,11 +724,16 @@
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
 'You can modify this application and adapt it to your needs': 'သင် ဒီ application ကို ပြုပြင်မွမ်းမံနိုင်ပါသည်။ ထို့အပြင် သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီစေရန် ပြုလုပ်နိုင်ပါသည်။',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'You visited the url %s': 'သင် လည်ပတ်ခဲ့သော URL %s',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 'စကားဝှက် အသစ် တောင်းဆိုရန်': 'စကားဝှက် အသစ် တောင်းဆိုရန်',
 'မှတ်ပုံတင်ရန်': 'မှတ်ပုံတင်ရန်',
 'ဝင်ရောက်အသုံးပြုရန်': 'ဝင်ရောက်အသုံးပြုရန်',

applications/admin/languages/nl.py

@@ -18,7 +18,23 @@
 '(something like "it-it")': '(zoiets als "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': '@markmin: zoeken: **%s** %%{file}',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'Abort': 'Afbreken',
 'About': 'Over',
 'about': 'over',
@@ -50,6 +66,7 @@
 'application is compiled and cannot be designed': 'applicatie is gecompileerd en kan niet worden ontworpen',
 'Application name:': 'Applicatienaam:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'worden niet gebruikt',
 'are not used yet': 'worden nog niet gebruikt',
 'Are you sure you want to delete file "%s"?': 'Weet je zeker dat je bestand "%s" wilt verwijderen?',
@@ -64,6 +81,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'LET OP: Login heeft beveiligde (HTTPS) verbinding nodig of moet draaien op localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'LET OP: TESTEN IS NIET THREAD SAFE EN PROBEER NIET MEERDERE TESTEN TEGELIJK TE DOEN.',
 'ATTENTION: you cannot edit the running application!': 'LET OP: je kan de draaiende applicatie niet bewerken!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Beschikbare databases en tabellen',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -92,6 +110,7 @@
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Verander admin wachtwoord',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'vink alles aan',
 'Check for upgrades': 'Controleer voor upgrades',
@@ -102,8 +121,10 @@
 'Clear CACHE?': 'Leeg CACHE?',
 'Clear DISK': 'Leeg DISK',
 'Clear RAM': 'Leeg RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Klik rij om traceback uit te klappen',
 'Click row to view a ticket': 'Klik rij om ticket te bekijken',
+'Client IP': 'Client IP',
 'code': 'code',
 'Code listing': 'Code listing',
 'collapse/expand all': 'klap in/klap alles uit',
@@ -165,6 +186,7 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deploymentformulier',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'design',
 'Detailed traceback description': 'Gedetailleerde traceback beschrijving',
@@ -191,6 +213,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
 'Edit': 'Bewerk',
 'edit all': 'bewerk alles',
 'Edit application': 'Bewerk applicatie',
@@ -204,6 +227,9 @@
 'Editing Plural Forms File': 'Meervoudsvormenbestand aan het bewerken',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Zet aan',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -243,8 +269,10 @@
 'filter': 'filter',
 'Find Next': 'Find Next',
 'Find Previous': 'Find Previous',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Functies zonder doctests zullen resulteren in [passed] tests.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -261,6 +289,10 @@
 'Goto': 'Ga naar',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'Help',
 'here': 'here',
 'Hide/Show Translated strings': 'Verberg/Toon Vertaalde strings',
@@ -277,6 +309,7 @@
 'Import/Export': 'Import/Export',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'Binnen ontwikkeling, gebruik de default Rocket webserver die op het moment ondersteund wordt door deze debugger.',
 'includes': 'includes',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'index': 'index',
 'insert new': 'insert new',
@@ -285,6 +318,7 @@
 'Install': 'Install',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Geïnstalleerde applicaties',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interactie op %s regel %s',
 'Interactive console': 'Interactieve console',
 'internal error': 'interne error',
@@ -294,24 +328,34 @@
 'Invalid application name': 'Invalid application name',
 'invalid circual reference': 'ongeldige cirkelreferentie',
 'invalid circular reference': 'Ongeldige circulaire referentie',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'ongeldig wachtwoord',
+'Invalid password': 'Invalid password',
 'invalid password.': 'ongeldig wachtwoord.',
 'Invalid Query': 'Ongeldige Query',
 'invalid request': 'ongeldige request',
 'Invalid request': 'Invalid request',
 'invalid request ': 'ongeldige request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'ongeldige tabelnamen (auth_* tabellen zijn al gedefinieerd)',
 'invalid ticket': 'ongeldige ticket',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
 'Key bindings': 'Key bindings',
 'Key bindings for ZenCoding Plugin': 'Key bindings voor ZenCoding Plugin',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill proces',
 'language file "%(filename)s" created/updated': 'taalbestand "%(filename)s" gemaakt/geupdate',
 'Language files (static strings) updated': 'Taalbestanden (statische strings) geupdate',
 'languages': 'talen',
 'Languages': 'Talen',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Laatst opgeslagen op:',
 'License for': 'Licentie voor',
@@ -326,8 +370,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'Login',
 'login': 'Login',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Login op de Administratieve Interface',
 'Login/Register': 'Login/Register',
@@ -355,10 +403,12 @@
 'Must include at least %s lowercase': 'Moet ten minste bevatten %s kleine letter',
 'Must include at least %s of the following : %s': 'Moet ten minste bevatten %s van het volgende : %s',
 'Must include at least %s uppercase': 'Moet ten minste bevatten %s hoofdletter',
+'Name': 'Name',
 'new application "%s" created': 'nieuwe applicatie "%s" gemaakt',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'Nieuwe Applicatie Wizard',
 'New application wizard': 'Nieuwe applicatie wizard',
+'New password': 'New password',
 'new plugin installed': 'nieuwe plugin geïnstalleerd',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Nieuw Record',
@@ -380,6 +430,8 @@
 'Not Authorized': 'Geen Rechten',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Notitie: Bij een Github error status code 128, zorg ervoor dat het systeem en het account dat je aan het deployen bent een correspondeerde ssh key geconfigureerd heeft in het openshift account. ',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": 'Om op productie deze debugger te gebruiken, moet je webserver configureren om een proces en meerdere threads te gebruiken.',
 'online designer': 'online designer',
 'Open new app in new window': 'Open new app in new window',
@@ -388,6 +440,7 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'of importeer van csv-bestand',
+'Origin': 'Origin',
 'Original/Translation': 'Oorspronkelijk/Vertaling',
 'Overview': 'Overview',
 'Overwrite installed app': 'Overschrijf geïnstalleerde app',
@@ -396,7 +449,12 @@
 'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
 'PAM authenticated user, cannot change password here': 'PAM geauthenticeerde gebruiker, kan wachtwoord hier niet wijzigen',
+'Password': 'Password',
 'password changed': 'wachtwoord gewijzigd',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Pad naar appcfg.py',
 'Path to local openshift repo root.': 'Pad naar lokale openshift repo root.',
@@ -405,6 +463,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Alstublieft',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin': 'plugin',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" gedetecteerd',
@@ -423,6 +482,7 @@
 'Previous Edit Point': 'Vorige Bewerkpunt',
 'Private files': 'Privébestanden',
 'private files': 'privébestanden',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Projectvoortgang',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -439,20 +499,36 @@
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
 'record': 'record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'record bestaat niet',
 'record id': 'record id',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'ververs',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Herlaadt routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Verwijder gecompileerde',
 'Removed Breakpoint on %s at line %s': 'Verwijder Breakpoint op %s op regel %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'vereist python-git, maar niet geïnstalleerd',
+'Reset Password key': 'Reset Password key',
 'resolve': 'oplossen',
 'Resolve Conflict file': 'Los Conflictbestand op',
 'response': 'antwoord',
@@ -495,6 +571,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Zet Breakpoint op %s op regel %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'signup': 'signup',
 'signup_requested': 'signup_requested',
 'Singular Form': 'Enkelvoudsvorm',
@@ -548,7 +625,9 @@
 'There are no views': 'Er zijn geen views',
 'These files are not served, they are only available from within your app': 'Deze bestanden worden niet geserveerd, ze zijn alleen beschikbaar vanuit binnen je app.',
 'These files are served without processing, your images go here': 'Deze bestanden worden geserveerd zonder verwerkingen, je afbeeldingen horen hier',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": 'Deze debugger werkt misschien niet goed, of je hebt geen threaded webserver, of je gebruikt multiple daemon processen.',
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'Dit is een experimentele feature en heeft meer tests nodig. Downgraden op eigen risico.',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'Dit is een experimentele feature en heeft meer tests nodig. Upgraden op eigen risico.',
 'This is the %(filename)s template': 'Dit is de %(filename)s template',
@@ -563,6 +642,7 @@
 'Ticket Missing': 'Ticket Missing',
 'tickets': 'tickets',
 'Time in Cache (h:m:s)': 'Tijd in Cache (u:m:s)',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'naar vorige versie.',
 'To create a plugin, name a file/folder plugin_[name]': 'Om een plugin te maken, neem een bestand/directory plugin_[naam]',
 'To emulate a breakpoint programatically, write:': 'Om een breakpoint programmatische te emuleren, schrijf:',
@@ -575,6 +655,7 @@
 'try something like': 'probeer zoiets als',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger commando hier en druk op Return (Enter) om het uit te voeren.',
 'Type python statement in here and hit Return (Enter) to execute it.': 'Type python statement hier en druk op Return (Enter) om het uit te voeren.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
@@ -592,6 +673,7 @@
 'unable to install application "%(appname)s"': 'onmogelijk om applicatie "%(appname)s" te installeren',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'onmogelijk om csv-bestand te parsen',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'onmogelijk om te deïnstalleren "%s"',
 'unable to upgrade because "%s"': 'onmogelijk om te upgraden omdat "%s"',
 'unauthorized': 'niet geautoriseerd ',
@@ -615,11 +697,26 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Gebruik (...)&(...) voor AND, (...)|(...) voor OR, en ~(...) voor NOT om meer complexe queries te maken.',
 'user': 'gebruiker',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Het gebruik van de shell kan database locken voor andere gebruikers van deze app.',
 'value not allowed': 'waarde is niet toegestaan',
 'variables': 'variabelen',
+'Verify Password': 'Verify Password',
 'Version': 'Versie',
 'Version %s.%s.%s (%s) %s': 'Versie %s.%s.%s (%s) %s',
 'Versioning': 'Versionering',
@@ -639,6 +736,7 @@
 'web2py Recent Tweets': 'web2py Recente Tweets',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py geupgrade; herstart alstublieft',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Working...': 'Working...',
 'Wrap with Abbreviation': 'Wrap met Afkorting',
 'WSGI reference name': 'WSGI reference name',
@@ -647,9 +745,14 @@
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Je kan ook een breakpoint zetten of verwijderen in het bewerkscherm met de Toggle Breakpoint-knop',
 'You can inspect variables using the console bellow': 'Je kan je variabelen inspecteren in de console hieronder',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'Je hebt nog een poging om in te loggen voor je buitengesloten wordt.',
 'you must specify a name for the uploaded application': 'je moet een naam specificeren voor de geuploade applicatie',
 'You need to set up and reach a': 'Je moet het volgende opzetten en bereiken:',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Je applicatie zal geblokkeerd zijn tot je een actie button aanklikt (volgende, step, ga door, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/pl.py

@@ -16,7 +16,23 @@
 '(something like "it-it")': '(coś podobnego do "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': 'Nowa wersja web2py jest dostępna',
 'A new version of web2py is available: %s': 'Nowa wersja web2py jest dostępna: %s',
 'Abort': 'Abort',
@@ -50,6 +66,7 @@
 'application is compiled and cannot be designed': 'aplikacja jest skompilowana i nie może być projektowana',
 'Application name:': 'Application name:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Czy na pewno chcesz usunąć plik "%s"?',
@@ -66,6 +83,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'UWAGA: Wymagane jest bezpieczne (HTTPS) połączenie lub połączenie z lokalnego adresu.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'UWAGA: TESTOWANIE NIE JEST BEZPIECZNE W ŚRODOWISKU WIELOWĄTKOWYM, TAK WIĘC NIE URUCHAMIAJ WIELU TESTÓW JEDNOCZEŚNIE.',
 'ATTENTION: you cannot edit the running application!': 'UWAGA: nie można edytować uruchomionych aplikacji!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Dostępne bazy danych i tabele',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -94,6 +112,7 @@
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'zaznacz wszystko',
 'Check for upgrades': 'check for upgrades',
@@ -106,9 +125,11 @@
 'Clear RAM': 'Clear RAM',
 'click here for online examples': 'kliknij aby przejść do interaktywnych przykładów',
 'click here for the administrative interface': 'kliknij aby przejść do panelu administracyjnego',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'kliknij aby sprawdzić aktualizacje',
+'Client IP': 'Client IP',
 'code': 'code',
 'Code listing': 'Code listing',
 'collapse/expand all': 'collapse/expand all',
@@ -168,6 +189,7 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'projektuj',
 'DESIGN': 'PROJEKTUJ',
@@ -196,6 +218,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
 'EDIT': 'EDYTUJ',
 'Edit': 'edytuj',
 'edit all': 'edit all',
@@ -211,6 +234,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -250,8 +276,10 @@
 'filter': 'filter',
 'Find Next': 'Find Next',
 'Find Previous': 'Find Previous',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Funkcje bez doctestów będą dołączone do [zaliczonych] testów.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -266,6 +294,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Hello World': 'Witaj Świecie',
 'Help': 'pomoc',
 'here': 'here',
@@ -284,6 +316,7 @@
 'Import/Export': 'Importuj/eksportuj',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'zawiera',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'insert new': 'wstaw nowy rekord tabeli',
 'insert new %s': 'wstaw nowy rekord do tabeli %s',
@@ -291,6 +324,7 @@
 'Install': 'install',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Zainstalowane aplikacje',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'wewnętrzny błąd',
@@ -299,15 +333,24 @@
 'Invalid action': 'Błędna akcja',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'błędne hasło',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Błędne zapytanie',
 'invalid request': 'błędne zapytanie',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'błędny bilet',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'plik tłumaczeń "%(filename)s" został utworzony/uaktualniony',
@@ -315,6 +358,7 @@
 'languages': 'pliki tłumaczeń',
 'Languages': 'Tłumaczenia',
 'languages updated': 'pliki tłumaczeń zostały uaktualnione',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Ostatnio zapisany:',
 'License for': 'Licencja dla',
@@ -328,8 +372,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'Zaloguj',
 'login': 'zaloguj',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Logowanie do panelu administracyjnego',
 'Login/Register': 'Login/Register',
@@ -350,10 +398,12 @@
 'Modules': 'Moduły',
 'modules': 'moduły',
 'Multi User Mode': 'Multi User Mode',
+'Name': 'Name',
 'new application "%s" created': 'nowa aplikacja "%s" została utworzona',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
+'New password': 'New password',
 'new plugin installed': 'nowa wtyczka została zainstalowana',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Nowy rekord',
@@ -373,6 +423,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
@@ -382,6 +434,7 @@
 'or import from csv file': 'lub zaimportuj z pliku csv',
 'or provide app url:': 'or provide app url:',
 'or provide application url:': 'lub podaj url aplikacji:',
+'Origin': 'Origin',
 'Original/Translation': 'Oryginał/tłumaczenie',
 'Overview': 'Overview',
 'Overwrite installed app': 'overwrite installed app',
@@ -390,7 +443,12 @@
 'Pack custom': 'Pack custom',
 'pack plugin': 'spakuj wtyczkę',
 'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
+'Password': 'Password',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -398,6 +456,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'wtyczka "%(plugin)s" została usunięta',
 'Plugin "%s" in application': 'Wtyczka "%s" w aplikacji',
@@ -414,6 +473,7 @@
 'previous 100 rows': 'poprzednie 100 wierszy',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -430,20 +490,36 @@
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
 'record': 'rekord',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'rekord nie istnieje',
 'record id': 'ID rekordu',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'usuń skompilowane',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Rozwiąż konflikt plików',
 'response': 'response',
 'restart': 'restart',
@@ -482,6 +558,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'powłoka',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'strona główna',
 'Size of cache:': 'Size of cache:',
@@ -536,7 +613,9 @@
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'pliki obsługiwane bez interpretacji, to jest miejsce na Twoje obrazy',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'To jest szablon %(filename)s',
@@ -549,6 +628,7 @@
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'TM': 'TM',
 'to  previous version.': 'do  poprzedniej wersji.',
 'To create a plugin, name a file/folder plugin_[name]': 'Aby utworzyć wtyczkę, nazwij plik/katalog plugin_[nazwa]',
@@ -564,6 +644,7 @@
 'try something like': 'spróbój czegos takiego jak',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Nie można sprawdzić aktualizacji',
@@ -580,6 +661,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'nie można sparsować pliku csv',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'nie można odinstalować "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'odznacz wszystko',
@@ -603,10 +685,25 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Użyj (...)&(...) jako AND, (...)|(...) jako OR oraz ~(...)  jako NOT do tworzenia bardziej skomplikowanych zapytań.',
 'Use an url:': 'Use an url:',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Verify Password': 'Verify Password',
 'Version': 'Wersja',
 'Versioning': 'Versioning',
 'versioning': 'versioning',
@@ -626,6 +723,7 @@
 'web2py Recent Tweets': 'najnowsze tweety web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome to web2py': 'Witaj w web2py',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI reference name',
@@ -633,8 +731,13 @@
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/pt-br.py

@@ -15,8 +15,23 @@
 '(something like "it-it")': '(algo como "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Buscando: **%s** arquivos',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': 'Está disponível uma nova versão do web2py',
 'A new version of web2py is available: %s': 'Está disponível uma nova versão do web2py: %s',
 'Abort': 'Abort',
@@ -50,6 +65,7 @@
 'application is compiled and cannot be designed': 'A aplicação está compilada e não pode ser modificada',
 'Application name:': 'Nome da aplicação:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Tem certeza que deseja apagar o arquivo "%s"?',
@@ -66,6 +82,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENÇÃO: o login requer uma conexão segura (HTTPS) ou executar de localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENÇÃO OS TESTES NÃO SÃO THREAD SAFE, NÃO EFETUE MÚLTIPLOS TESTES AO MESMO TEMPO.',
 'ATTENTION: you cannot edit the running application!': 'ATENÇÃO: Não pode modificar a aplicação em execução!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Bancos de dados e tabelas disponíveis',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -96,6 +113,7 @@
 'Change admin password': 'mudar senha de administrador',
 'change editor settings': 'change editor settings',
 'Change Password': 'Mudar Senha',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'marcar todos',
 'Check for upgrades': 'Verificar se existem atualizações',
@@ -108,6 +126,7 @@
 'Clear RAM': 'Clear RAM',
 'click here for online examples': 'clique para ver exemplos online',
 'click here for the administrative interface': 'Clique aqui para acessar a interface administrativa',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Clique na linha para expandir o traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'clique aqui para verificar se existem atualizações',
@@ -221,6 +240,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -263,6 +285,7 @@
 'First name': 'Nome',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Funções sem doctests resultarão em testes [aceitos].',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -277,7 +300,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'ID do Grupo',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Hello World': 'Olá Mundo',
 'Help': 'Ajuda',
 'here': 'here',
@@ -296,6 +322,7 @@
 'Import/Export': 'Importar/Exportar',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'inclui',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'insert new': 'inserir novo',
 'insert new %s': 'inserir novo %s',
@@ -303,6 +330,7 @@
 'Install': 'instalar',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Aplicações instaladas',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'erro interno',
@@ -313,14 +341,22 @@
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'E-mail inválido',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'senha inválida',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Consulta inválida',
 'invalid request': 'solicitação inválida',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'ticket inválido',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'arquivo de idioma "%(filename)s" criado/atualizado',
@@ -342,8 +378,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'login': 'início de sessão',
 'Login': 'Entrar',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Entrar na interface adminitrativa',
 'Login/Register': 'Login/Register',
@@ -371,6 +411,7 @@
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'Assistente para novas aplicações ',
 'New application wizard': 'Assistente para novas aplicações',
+'New password': 'New password',
 'new plugin installed': 'novo plugin instalado',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Novo registro',
@@ -390,6 +431,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
@@ -410,6 +453,10 @@
 'PAM authenticated user, cannot change password here': 'usuário autenticado por PAM não pode alterar a senha aqui',
 'Password': 'Senha',
 'password changed': 'senha alterada',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -417,6 +464,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" apagado',
 'Plugin "%s" in application': 'Plugin "%s" na aplicação',
@@ -433,6 +481,7 @@
 'previous 100 rows': '100 registros anteriores',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -449,23 +498,37 @@
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
 'record': 'registro',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'o registro não existe',
 'record id': 'id do registro',
 'Record ID': 'ID do Registro',
 'Record id': 'Record id',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
 'Register': 'Registrar-se',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Chave de registro',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Recarregar routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Eliminar compilados',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Arquivo de resolução de conflito',
 'response': 'response',
 'restart': 'reiniciar',
@@ -504,6 +567,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'Terminal',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'Site',
 'Size of cache:': 'Size of cache:',
@@ -559,7 +623,9 @@
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'Estes arquivos são servidos sem processamento, suas imagens ficam aqui',
 'these files are served without processing, your images go here': 'Estes arquivos são servidos sem processamento, suas imagens ficam aqui',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'Este é o template %(filename)s',
@@ -588,6 +654,7 @@
 'try something like': 'tente algo como',
 'Try the mobile interface': 'Experimente a interface para smartphones e tablets',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Não é possível checar as atualizações',
@@ -604,6 +671,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'não é possível analisar o arquivo CSV',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'não é possível desinstalar "%s"',
 'unable to upgrade because "%s"': 'não é possível atualizar porque "%s"',
 'uncheck all': 'desmarcar todos',
@@ -626,11 +694,25 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, e ~(...) para NOT, para criar consultas mais complexas.',
 'Use an url:': 'Use uma url:',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'ID do Usuário',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variáveis',
+'Verify Password': 'Verify Password',
 'Version': 'Versão',
 'Versioning': 'Versionamento',
 'versioning': 'versionamento',
@@ -650,6 +732,7 @@
 'web2py Recent Tweets': 'Tweets Recentes de @web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py atualizado; favor reiniciar',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome to web2py': 'Bem-vindo ao web2py',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI reference name',
@@ -657,8 +740,13 @@
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/pt.py

@@ -16,9 +16,23 @@
 '(something like "it-it")': '(algo como "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': 'Está disponível uma nova versão do web2py',
 'A new version of web2py is available: %s': 'Está disponível uma nova versão do web2py: %s',
 'Abort': 'Abort',
@@ -52,6 +66,7 @@
 'application is compiled and cannot be designed': 'A aplicação está compilada e não pode ser modificada',
 'Application name:': 'Nome da aplicação:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'não usadas',
 'are not used yet': 'ainda não usadas',
 'Are you sure you want to delete file "%s"?': 'Tem certeza que deseja apagar o arquivo "%s"?',
@@ -68,6 +83,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENÇÃO o login requer uma conexão segura (HTTPS) ou executar de localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENÇÃO OS TESTES NÃO THREAD SAFE, NÃO EFETUE MÚLTIPLOS TESTES AO MESMO TEMPO.',
 'ATTENTION: you cannot edit the running application!': 'ATENÇÃO: Não pode modificar a aplicação em execução!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocompletar Código Python',
 'Available databases and tables': 'Bancos de dados e tabelas disponíveis',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -98,6 +114,7 @@
 'Change admin password': 'mudar senha de administrador',
 'change editor settings': 'mudar definições do editor',
 'Change Password': 'Trocar Senha',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'marcar todos',
 'Check for upgrades': 'checar por atualizações',
@@ -110,6 +127,7 @@
 'Clear RAM': 'Clear RAM',
 'click here for online examples': 'clique para ver exemplos online',
 'click here for the administrative interface': 'Clique aqui para acessar a interface administrativa',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Clique em uma coluna para expandir o log do erro',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'clique aqui para checar por atualizações',
@@ -223,6 +241,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -265,6 +286,7 @@
 'First name': 'Nome',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Funções sem doctests resultarão em testes [aceitos].',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -279,7 +301,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'ID do Grupo',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Hello World': 'Olá Mundo',
 'Help': 'ajuda',
 'here': 'here',
@@ -298,6 +323,7 @@
 'Import/Export': 'Importar/Exportar',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'inclui',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'insert new': 'inserir novo',
 'insert new %s': 'inserir novo %s',
@@ -305,6 +331,7 @@
 'Install': 'instalar',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Aplicações instaladas',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'erro interno',
@@ -315,14 +342,22 @@
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'E-mail inválido',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'senha inválida',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Consulta inválida',
 'invalid request': 'solicitação inválida',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'ticket inválido',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Atalhos de teclado',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'arquivo de linguagem "%(filename)s" criado/atualizado',
@@ -344,8 +379,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'login': 'inicio de sessão',
 'Login': 'Entrar',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Entrar na interface adminitrativa',
 'Login/Register': 'Login/Register',
@@ -373,6 +412,7 @@
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'Assistente para novas aplicações ',
+'New password': 'New password',
 'new plugin installed': 'novo plugin instalado',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Novo registro',
@@ -393,6 +433,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'online designer',
 'Open new app in new window': 'Open new app in new window',
@@ -414,6 +456,10 @@
 'PAM authenticated user, cannot change password here': 'usuario autenticado por PAM, não pode alterar a senha por aqui',
 'Password': 'Senha',
 'password changed': 'senha alterada',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -421,6 +467,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" eliminado',
 'Plugin "%s" in application': 'Plugin "%s" na aplicação',
@@ -437,6 +484,7 @@
 'previous 100 rows': '100 registros anteriores',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -454,23 +502,37 @@
 'Read': 'Read',
 'Record': 'Record',
 'record': 'registro',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'o registro não existe',
 'record id': 'id do registro',
 'Record ID': 'ID do Registro',
 'Record id': 'Record id',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
 'Register': 'Registrar-se',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Chave de registro',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'eliminar compilados',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Substituir',
 'Replace All': 'Substituir Tudo',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Arquivo de resolução de conflito',
 'response': 'response',
 'restart': 'restart',
@@ -509,6 +571,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'Terminal',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'site',
 'Size of cache:': 'Size of cache:',
@@ -564,7 +627,9 @@
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'Estes arquivos são servidos sem processamento, suas imagens ficam aqui',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'Este é o template %(filename)s',
@@ -593,6 +658,7 @@
 'try something like': 'tente algo como',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Não é possível checar as atualizações',
@@ -609,6 +675,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'não é possível analisar o arquivo CSV',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'não é possível instalar "%s"',
 'unable to upgrade because "%s"': 'não é possível atualizar porque "%s"',
 'uncheck all': 'desmarcar todos',
@@ -632,11 +699,25 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, y ~(...) para NOT, para criar consultas mais complexas.',
 'Use an url:': 'Use uma url:',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'ID do Usuario',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variáveis',
+'Verify Password': 'Verify Password',
 'Version': 'Versão',
 'Versioning': 'Versioning',
 'versioning': 'versionamento',
@@ -656,6 +737,7 @@
 'web2py Recent Tweets': 'Tweets Recentes de @web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py atualizado; favor reiniciar',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome to web2py': 'Bem-vindo ao web2py',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI reference name',
@@ -663,8 +745,13 @@
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/ro.py

@@ -23,7 +23,23 @@
 '>': '>',
 '>=': '>=',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Căutare: **%s** fișiere',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': 'O nouă versiune de web2py este disponibilă',
 'A new version of web2py is available: %s': 'O nouă versiune de web2py este disponibilă: %s',
 'Abort': 'Anulează',
@@ -64,6 +80,7 @@
 'application is compiled and cannot be designed': 'aplicația este compilată și nu poate fi editată',
 'Application name:': 'Nume aplicație:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Sigur ștergeți fișierul "%s"?',
@@ -80,6 +97,7 @@
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENȚIE: Nu puteți efectua mai multe teste o dată deoarece lansarea în execuție a mai multor subpocese nu este sigură.',
 'ATTENTION: you cannot edit the running application!': 'ATENȚIE: nu puteți edita o aplicație în curs de execuție!',
 'Authentication': 'Autentificare',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Baze de date și tabele disponibile',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -124,6 +142,7 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Clic pe linie pentru a extinde mesajul de trasabilitate',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'Clic pentru a verifica dacă există upgrade-uri',
@@ -250,6 +269,9 @@
 'Editor': 'Editor',
 'Email Address': 'Email Address',
 'Email and SMS': 'E-mail și SMS',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -301,6 +323,7 @@
 'Forms and Validators': 'Formulare și validatori',
 'Frames': 'Frames',
 'Free Applications': 'Aplicații gratuite',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Funcțiile fără doctests vor genera teste [trecute].',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -318,6 +341,7 @@
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
 'Group %(group_id)s created': 'Grup %(group_id)s creat',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'ID grup',
 'Group uniquely assigned to user %(id)s': 'Grup asociat în mod unic utilizatorului %(id)s',
 'Groups': 'Grupuri',
@@ -342,6 +366,7 @@
 'Import/Export': 'Import/Export',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'include',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'Index': 'Index',
 'index': 'index',
@@ -351,6 +376,7 @@
 'Install': 'Instalează',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Aplicații instalate',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'eroare internă',
@@ -362,17 +388,24 @@
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'E-mail invalid',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'parolă invalidă',
 'Invalid password': 'Parolă invalidă',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Interogare invalidă',
 'invalid request': 'cerere invalidă',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'tichet invalid',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
 'Key bindings': 'Combinație taste',
 'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'fișier de limbă "%(filename)s" creat/actualizat',
@@ -399,10 +432,12 @@
 'locals': 'localizare',
 'Locals##debug': 'Locals##debug',
 'located in the file': 'prezentă în fișierul',
+'Log In': 'Log In',
 'Logged in': 'Logat',
 'Logged out': 'Delogat',
 'login': 'autentificare',
 'Login': 'Autentificare',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Logare interfață de administrare',
 'Login/Register': 'Login/Register',
@@ -486,7 +521,10 @@
 'pack plugin': 'pack plugin',
 'Password': 'Parola',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
 "Password fields don't match": 'Câmpurile de parolă nu se potrivesc',
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -514,6 +552,7 @@
 'Private files': 'Private files',
 'private files': 'private files',
 'Profile': 'Profil',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Progres proiect',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -534,15 +573,24 @@
 'Recipes': 'Rețete',
 'Record': 'Record',
 'record': 'înregistrare',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'înregistrare inexistentă',
 'record id': 'id înregistrare',
 'Record ID': 'ID înregistrare',
 'Record id': 'Record id',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'înregistrare',
 'Register': 'Înregistrare',
 'Registration identifier': 'Identificator de autentificare',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Cheie înregistrare',
+'Registration needs verification': 'Registration needs verification',
 'Registration successful': 'Autentificare reușită',
 'Reload routes': 'Reîncarcare rute',
 'Remember me (for 30 days)': 'Ține-mă minte (timp de 30 de zile)',
@@ -598,6 +646,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'line de commandă',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'site': 'site',
 'Site': 'Site',
@@ -661,7 +710,9 @@
 'These files are served without processing, your images go here': 'Aceste fișiere sunt servite fără procesare, fișierele imagine se pun aici',
 'these files are served without processing, your images go here': 'aceste fișiere sunt servite fără procesare, imaginea se plasează acolo',
 'This App': 'Această aplicație',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is a copy of the scaffolding application': 'Aceasta este o copie a aplicației schelet',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
@@ -693,6 +744,7 @@
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Imposibil de verificat dacă există actualizări',
@@ -708,6 +760,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'imposibil de analizat fișierul csv',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'imposibil de dezinstalat "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'decoșează tot',
@@ -730,14 +783,21 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Folosiți (...)&(...) pentru ȘI, (...)|(...) pentru SAU, și ~(...) pentru NEGARE, pentru a crea interogări complexe.',
 'user': 'utilizator',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
 'User %(id)s Logged-in': 'Utilizator %(id)s autentificat',
 'User %(id)s Logged-out': 'Utilizator %(id)s delogat',
 'User %(id)s Password changed': 'Parola utilizatorului %(id)s a fost schimbată',
 'User %(id)s Password reset': 'Resetare parola utilizator %(id)s',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
 'User %(id)s Profile updated': 'Profil utilizator %(id)s actualizat',
 'User %(id)s Registered': 'Utilizator %(id)s înregistrat',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'ID utilizator',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'value already in database or empty': 'Valoare existentă în baza de date sau vidă',
@@ -767,6 +827,7 @@
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
 'Welcome': 'Bine ați venit',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome %s': 'Bine ați venit %s',
 'Welcome to web2py': 'Bun venit la web2py',
 'Welcome to web2py!': 'Bun venit la web2py!',
@@ -780,9 +841,14 @@
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
 'You can modify this application and adapt it to your needs': 'Puteți modifica și adapta aplicația nevoilor dvs.',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'You visited the url': 'Ați vizitat adresa',
 '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 password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/ru.py

@@ -16,7 +16,23 @@
 '(something like "it-it")': '(наподобие "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Найдено: **%s** %%{файл}',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': 'Доступна новая версия web2py',
 'A new version of web2py is available: %s': 'Доступна новая версия web2py: %s',
 'Abort': 'Отмена',
@@ -51,6 +67,7 @@
 'application is compiled and cannot be designed': 'Приложение скомпилировано и дизайн не может быть изменен',
 'Application name:': 'Название приложения:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Вы действительно хотите удалить файл "%s"?',
@@ -69,6 +86,7 @@
 'ATTENTION: This is an experimental feature and it needs more testing.': 'ВНИМАНИЕ: Это экспериментальная возможность и требует тестирования.',
 'ATTENTION: you cannot edit the running application!': 'ВНИМАНИЕ: Вы не можете редактировать работающее приложение!',
 'Authentication': 'Аутентификация',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Доступные базы данных и таблицы',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -101,6 +119,7 @@
 'change editor settings': 'change editor settings',
 'Change Password': 'Изменить пароль',
 'change password': 'изменить пароль',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'проверить все',
 'Check for upgrades': 'проверить обновления',
@@ -113,6 +132,7 @@
 'Clear RAM': 'Clear RAM',
 'click here for online examples': 'нажмите здесь для онлайн примеров',
 'click here for the administrative interface': 'нажмите здесь для интерфейса администратора',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'нажмите для проверки обновления',
@@ -229,6 +249,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -273,6 +296,7 @@
 'First name': 'Имя',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Функции без doctest будут давать [прошел] в тестах.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -289,7 +313,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'ID группы',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Hello World': 'Привет, Мир',
 'Help': 'Помощь',
 'here': 'here',
@@ -310,6 +337,7 @@
 'Import/Export': 'Импорт/Экспорт',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'включает',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'Index': 'Индекс',
 'index': 'index',
@@ -319,6 +347,7 @@
 'Install': 'Установить',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Установленные приложения',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'внутренняя ошибка',
@@ -329,16 +358,24 @@
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'Неверный email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'неверный пароль',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Неверный запрос',
 'invalid request': 'неверный запрос',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'неверный тикет',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
 'Key bindings': 'Комбинации клавиш',
 'Key bindings for ZenConding Plugin': 'Комбинации клавиш для плагина ZenConding',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'Языковой файл "%(filename)s" создан/обновлен',
@@ -362,8 +399,12 @@
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
 'located in the file': 'расположенный в файле',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'login': 'логин',
 'Login': 'Логин',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Вход в интерфейс администратора',
 'Login/Register': 'Login/Register',
@@ -394,6 +435,7 @@
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'Мастер нового приложения',
+'New password': 'New password',
 'new plugin installed': 'new plugin installed',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Новая запись',
@@ -414,6 +456,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
@@ -433,6 +477,10 @@
 'pack plugin': 'Упаковать плагин',
 'Password': 'Пароль',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -440,6 +488,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'please wait!': 'подождите, пожалуйста!',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
@@ -458,6 +507,7 @@
 'Previous Edit Point': 'Предыдущее место правки',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -474,21 +524,34 @@
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
 'record': 'запись',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'запись не существует',
 'record id': 'id записи',
 'Record ID': 'ID записи',
 'Record id': 'Record id',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'Register': 'Зарегистрироваться',
 'register': 'зарегистрироваться',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Ключ регистрации',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Удалить скомпилированное',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
 'Reset Password key': 'Сброс пароля',
@@ -531,6 +594,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'сайт',
 'Size of cache:': 'Size of cache:',
@@ -593,7 +657,9 @@
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'Эти файлы обслуживаются без обработки, ваши изображения попадут сюда',
 'these files are served without processing, your images go here': 'Эти файлы обслуживаются без обработки, ваши изображения попадут сюда',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is a copy of the scaffolding application': 'Это копия сгенерированного приложения',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
@@ -623,6 +689,7 @@
 'try something like': 'попробовать что-либо вида',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Невозможно проверить обновления',
@@ -638,6 +705,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'невозможно разобрать файл csv',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'невозможно удалить "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'снять выбор всего',
@@ -662,11 +730,25 @@
 'Use an url:': 'Используйте url:',
 'user': 'пользователь',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'ID пользователя',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'переменные',
+'Verify Password': 'Verify Password',
 'Version': 'Версия',
 'Versioning': 'Versioning',
 'versioning': 'версии',
@@ -687,6 +769,7 @@
 'web2py Recent Tweets': 'последние твиты по web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome %s': 'Добро пожаловать, %s',
 'Welcome to web2py': 'Добро пожаловать в web2py',
 'Which called the function': 'Который вызвал функцию',
@@ -700,9 +783,14 @@
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
 'You can modify this application and adapt it to your needs': 'Вы можете изменить это приложение и подогнать под свои нужды',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'You visited the url': 'Вы посетили URL',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/sl.py

@@ -16,7 +16,23 @@
 '(something like "it-it")': '(nekaj kot "sl-SI" ali samo "sl")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Iskanje: **%s** datoteke',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': 'Nova različica web2py je na voljo',
 'A new version of web2py is available: %s': 'Nova različica web2py je na voljo: %s',
 'Abort': 'Preklic',
@@ -51,6 +67,7 @@
 'application is compiled and cannot be designed': 'aplikacija je prevedena in je ne morete popravljati',
 'Application name:': 'Ime aplikacije:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': 'Ali res želite pobrisati datoteko "%s"?',
@@ -69,6 +86,7 @@
 'ATTENTION: This is an experimental feature and it needs more testing.': 'POZOR: To je preizkusni fazi in potrebuje več testiranja.',
 'ATTENTION: you cannot edit the running application!': 'POZOR: Ne morete urejati aplikacije, ki že teče!',
 'Authentication': 'Avtentikacija',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Podatkovne baze in tabele',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -101,6 +119,7 @@
 'change editor settings': 'change editor settings',
 'Change Password': 'Spremeni geslo',
 'change password': 'spremeni geslo',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'označi vse',
 'Check for upgrades': 'Preveri za posodobitve',
@@ -113,6 +132,7 @@
 'Clear RAM': 'Clear RAM',
 'click here for online examples': 'kliknite za spletne primere',
 'click here for the administrative interface': 'kliknite za skrbniški vmesnik',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Kliknite vrstico da razširite sledenje',
 'Click row to view a ticket': 'Kliknite vrstico za ogled listka',
 'click to check for upgrades': 'kliknite za preverjanje nadgradenj',
@@ -229,6 +249,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -273,6 +296,7 @@
 'First name': 'Ime',
 'Form has errors': 'Form has errors',
 'Frames': 'Okvirji',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Funkcije brez doctest bodo opravile teste brez preverjanja.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -289,7 +313,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'ID skupine',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Hello World': 'Pozdravljen, Svet!',
 'Help': 'Pomoč',
 'here': 'here',
@@ -310,6 +337,7 @@
 'Import/Export': 'Uvoz/Izvoz',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'vključuje',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'Index': 'Indeks',
 'index': 'indeks',
@@ -319,6 +347,7 @@
 'Install': 'Namesti',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Nameščene aplikacije',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'notranja napaka',
@@ -329,16 +358,24 @@
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'Napačen e-naslov',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'napačno geslo',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': 'Napačno povpraševanje',
 'invalid request': 'napačna zahteva',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'napačen kartonček',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
 'Key bindings': 'Povezave tipk',
 'Key bindings for ZenConding Plugin': 'Povezave tipk za ZenConding vtičnik',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'jezikovna datoteka "%(filename)s" ustvarjena/posodobljena',
@@ -362,8 +399,12 @@
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
 'located in the file': 'se nahaja v datoteki',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'login': 'prijava',
 'Login': 'Prijava',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Prijava v skrbniški vmesnik',
 'Login/Register': 'Login/Register',
@@ -394,6 +435,7 @@
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'Čarovnik za novo aplikacijo',
 'New application wizard': 'Čarovnik za novo aplikacijo',
+'New password': 'New password',
 'new plugin installed': 'new plugin installed',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Nov zapis',
@@ -414,6 +456,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
@@ -433,6 +477,10 @@
 'pack plugin': 'zapakiraj vtičnik',
 'Password': 'Geslo',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -440,6 +488,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'please wait!': 'Prosim počakajte!',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
@@ -458,6 +507,7 @@
 'Previous Edit Point': 'Prejšnja točka urejanja',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -474,21 +524,34 @@
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
 'record': 'zapis',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'zapis ne obstaja',
 'record id': 'id zapisa',
 'Record ID': 'ID zapisa',
 'Record id': 'Record id',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'Register': 'Registracija',
 'register': 'registracija',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Registracijski ključ',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Ponovno naloži preusmeritve',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Odstrani prevedeno',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'zahteva',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
 'Reset Password key': 'Ponastavi ključ gesla',
@@ -530,6 +593,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'lupina',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'Spletišče',
 'Size of cache:': 'Size of cache:',
@@ -592,7 +656,9 @@
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'Te datoteke so poslane brez obdelave. Vaše slike shranite tu.',
 'these files are served without processing, your images go here': 'te datoteke so poslane brez posredovanja in obdelave, svoje slike shranite tu',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is a copy of the scaffolding application': 'To je kopija okvirne aplikacije',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
@@ -622,6 +688,7 @@
 'try something like': 'poskusite na primer',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Ne morem preveriti posodobitev',
@@ -637,6 +704,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'ne morem obdelati csv datoteke',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'ne morem odstraniti "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'odznači vse',
@@ -661,11 +729,25 @@
 'Use an url:': 'Uporabite URL:',
 'user': 'uporabnik',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'ID uporabnika',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'spremenljivke',
+'Verify Password': 'Verify Password',
 'Version': 'Različica',
 'Versioning': 'Versioning',
 'versioning': 'različice',
@@ -686,6 +768,7 @@
 'web2py Recent Tweets': 'zadnji tviti na web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome %s': 'Dobrodošli, %s',
 'Welcome to web2py': 'Dobrodošli v web2py',
 'Which called the function': 'Ki je klical funkcijo',
@@ -699,9 +782,14 @@
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
 'You can modify this application and adapt it to your needs': 'Lahko spremenite to aplikacijo in jo prilagodite vašim potrebam',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'You visited the url': 'Obiskali ste URL',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/sr-cr.py

@@ -16,7 +16,23 @@
 '(something like "it-it")': '(на примјер "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(датотека **gluon/contrib/plural_rules/%s.py** није пронађена)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** %%{file}',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'Abort': 'Одустани',
 'About': 'Информације',
 'About application': 'О апликацији',
@@ -45,6 +61,7 @@
 'application is compiled and cannot be designed': 'апликација је компајлирана и не може се даље уређивати',
 'Application name:': 'Назив апликације:',
 'Application updated via git pull': 'Апликација ажурирана преко git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'није кориштено',
 'are not used yet': 'није још кориштено',
 'Are you sure you want to delete file "%s"?': 'Да ли сте сигурни да желите избрисати датотеку "%s"?',
@@ -59,6 +76,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
 'ATTENTION: you cannot edit the running application!': 'ПАЖЊА: не можете уређивати покренуту апликацију!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available Databases and Tables': 'Доступне базе података и табеле',
 'back': 'назад',
@@ -85,6 +103,7 @@
 'Change Admin Password': 'Промијени лозинку администратора',
 'Change admin password': 'Промијени лозинку администратора',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'check all',
 'Check for upgrades': 'Провјери могућност надоградње',
@@ -95,8 +114,10 @@
 'Clear CACHE?': 'Обриши CACHE?',
 'Clear DISK': 'Обриши DISK',
 'Clear RAM': 'Обриши RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
+'Client IP': 'Client IP',
 'code': 'код',
 'Code listing': 'Приказ кода',
 'collapse/expand all': 'сакрити/приказати све',
@@ -153,6 +174,7 @@
 'Deploy to PythonAnywhere': 'Постави на PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'design',
 'Detailed traceback description': 'Detailed traceback description',
@@ -179,6 +201,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'преузми помоћне модуле',
 'Download plugins from repository': 'Преузми помоћне модуле из репозиторијум',
+'E-mail': 'E-mail',
 'Edit': 'Уреди',
 'edit all': 'уреди све',
 'Edit application': 'Уреди апликацију',
@@ -192,6 +215,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -229,8 +255,10 @@
 'filter': 'филтер',
 'Find Next': 'Пронађи сљедећи',
 'Find Previous': 'Пронађи претходни',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -247,6 +275,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'Помоћ',
 'here': 'here',
 'Hide/Show Translated strings': 'Сакрити/Приказати преведене ријечи',
@@ -263,11 +295,13 @@
 'Import/Export': 'инсталационо окружење',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'укључује',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'inspect attributes': 'inspect attributes',
 'Install': 'Инсталирај',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Инсталиране апликације',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'унутрашња грешка',
@@ -276,23 +310,33 @@
 'Invalid action': 'Invalid action',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'Неважећа лозинка',
+'Invalid password': 'Invalid password',
 'invalid password.': 'неважећа лозинка.',
 'Invalid Query': 'Погрешан упит',
 'invalid request': 'invalid request',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'погрешан тикет',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
 'Key bindings': 'Пречице',
 'Key bindings for ZenCoding Plugin': 'Пречице за ZenCoding Plugin',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Пречице на тастатури',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'језичка датотека "%(filename)s" је креирана/ажурирана',
 'Language files (static strings) updated': 'Језичке датотеке су ажуриране',
 'languages': 'језици',
 'Languages': 'Језици',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Посљедња измјена:',
 'License for': 'Лиценца за',
@@ -306,7 +350,11 @@
 'Local Apps': 'Локалне апликације',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'Пријава',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Пријава за административно окружење',
 'Login/Register': 'Пријава/Регистрација',
@@ -329,10 +377,12 @@
 'Modules': 'Модули',
 'modules': 'модули',
 'Multi User Mode': 'Вишекориснички режим рада',
+'Name': 'Name',
 'new application "%s" created': 'нова апликација "%s" је креирана',
 'new application "%s" imported': 'нова апликација "%s" је увежена',
 'New Application Wizard': 'Чаробњак за нове апликације',
 'New application wizard': 'Чаробњак за нове апликације',
+'New password': 'New password',
 'new plugin installed': 'нови помоћни модул је инсталиран',
 'New plugin installed: %s': 'Инсталиран нови помоћни модул: %s',
 'New Record': 'Нови запис',
@@ -353,6 +403,8 @@
 'Not Authorized': 'Немате овлашћење',
 'Not supported': 'Није подржано',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'онлајн дизајнер',
 'Open new app in new window': 'Отвори нову апликацију у новом прозору',
@@ -361,6 +413,7 @@
 'or alternatively': 'или алтернативно',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'или увези помоћу csv датотеке',
+'Origin': 'Origin',
 'Original/Translation': 'Оргинал/Превод',
 'Overview': 'Преглед',
 'Overwrite installed app': 'Замјени већ постојећу апликацију',
@@ -368,7 +421,12 @@
 'Pack compiled': 'Запакуј компајлирано',
 'Pack custom': 'Прилагођено паковање',
 'pack plugin': 'запакуј помоћни модул',
+'Password': 'Password',
 'password changed': 'лозинка је промијењена',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Претходне корекције',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -376,6 +434,7 @@
 'Permission': 'Дозвола',
 'Permissions': 'Дозволе',
 'Please': 'Молим',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'помоћни модул "%(plugin)s" је избрисан',
 'Plugin "%s" in application': 'Помоћни модул "%s" у апликацији',
@@ -392,6 +451,7 @@
 'Previous Edit Point': 'Previous Edit Point',
 'Private files': 'Приватне датотеке',
 'private files': 'приватне датотеке',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Напредак пројекта',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -407,19 +467,35 @@
 'Ram Cleared': 'Ram Cleared',
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'record does not exist',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Обнови преусмјерења',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Уклони компајлирано',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Замијени',
 'Replace All': 'Замијени све',
 'Repository (%s)': 'Репозиторијум (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Resolve Conflict file',
 'response': 'response',
 'restart': 'restart',
@@ -456,6 +532,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'Сајт',
 'Size of cache:': 'Size of cache:',
@@ -504,7 +581,9 @@
 'There are no views': 'Нема преводиоца',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
@@ -516,6 +595,7 @@
 'Ticket ID': 'Тикет ID',
 'Ticket Missing': 'Недостаје тикет',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'на претходну верзију.',
 'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -528,6 +608,7 @@
 'try something like': 'на примјер',
 'Try the mobile interface': 'Пробај мобилнo окружење',
 'try view': 'пробај приказ',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Не могу да провјерим могућност надоградње',
@@ -541,6 +622,7 @@
 'Unable to download the list of plugins': 'Не могу да преузмем списак помоћних модула',
 'unable to install plugin "%s"': 'не могу да инсталирам помоћни модул "%s"',
 'unable to parse csv file': 'не могу да расчланим csv датотеку',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'не могу да деинсталирам "%s"',
 'unable to upgrade because "%s"': 'не могу да ажуримам због "%s"',
 'uncheck all': 'uncheck all',
@@ -559,10 +641,25 @@
 'upload plugin file:': 'преузми датотеку помоћног модула:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'User': 'Корисник',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Корисничко име',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Корисници',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Verify Password': 'Verify Password',
 'Version': 'Верзија',
 'Version %s.%s.%s (%s) %s': 'Верзија %s.%s.%s (%s) %s',
 'Versioning': 'Креирање верзија',
@@ -581,6 +678,7 @@
 'web2py Recent Tweets': 'web2py Recent Tweets',
 'web2py upgrade': 'web2py надоградња',
 'web2py upgraded; please restart it': 'web2py је ажуриран; молим да рестартујете',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Working...': 'Извршавам...',
 'Wrap with Abbreviation': 'Wrap with Abbreviation',
 'WSGI reference name': 'WSGI reference name',
@@ -588,8 +686,13 @@
 'Yes': 'Да',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/sr-lt.py

@@ -16,8 +16,23 @@
 '(something like "it-it")': '(na primjer "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(datoteka **gluon/contrib/plural_rules/%s.py** nije pronađena)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** %%{file}',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'Abort': 'Odustani',
 'About': 'Informacije',
 'About application': 'O aplikaciji',
@@ -46,6 +61,7 @@
 'application is compiled and cannot be designed': 'aplikacija je kompajlirana i ne može se dalje uređivati',
 'Application name:': 'Naziv aplikacije:',
 'Application updated via git pull': 'Aplikacija ažurirana preko git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'nije korišteno',
 'are not used yet': 'nije još korišteno',
 'Are you sure you want to delete file "%s"?': 'Da li ste sigurni da želite izbrisati datoteku "%s"?',
@@ -60,6 +76,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
 'ATTENTION: you cannot edit the running application!': 'ATTENTION: ne možete uređivati pokrenutu aplikaciju!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available Databases and Tables': 'Dostupne baze podataka i tabele',
 'back': 'nazad',
@@ -86,6 +103,7 @@
 'Change admin password': 'Promijeni lozinku administratora',
 'Change Admin Password': 'Promijeni lozinku administratora',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'check all',
 'Check for upgrades': 'Provjeri mogućnost nadogradnje',
@@ -96,8 +114,10 @@
 'Clear CACHE?': 'Obriši CACHE?',
 'Clear DISK': 'Obriši DISK',
 'Clear RAM': 'Obriši RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
+'Client IP': 'Client IP',
 'code': 'kod',
 'Code listing': 'Prikaz koda',
 'collapse/expand all': 'sakriti/prikazati sve',
@@ -154,6 +174,7 @@
 'Deploy to PythonAnywhere': 'Postavi na PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'design',
 'Detailed traceback description': 'Detailed traceback description',
@@ -180,6 +201,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'preuzmi pomoćne module',
 'Download plugins from repository': 'Preuzmi pomoćne module iz repozitorijum',
+'E-mail': 'E-mail',
 'Edit': 'Uredi',
 'edit all': 'uredi sve',
 'Edit application': 'Uredi aplikaciju',
@@ -193,6 +215,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -230,8 +255,10 @@
 'filter': 'filter',
 'Find Next': 'Pronađi sljedeći',
 'Find Previous': 'Pronađi prethodni',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -248,6 +275,10 @@
 'Goto': 'Goto',
 'Graph Model': 'Graph Model',
 'graph model': 'graph model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'Pomoć',
 'here': 'here',
 'Hide/Show Translated strings': 'Sakriti/Prikazati prevedene riječi',
@@ -264,11 +295,13 @@
 'Import/Export': 'Uvoz/Izvoz',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'uključuje',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'inspect attributes': 'inspect attributes',
 'Install': 'Instaliraj',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Instalirane aplikacije',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'unutrašnja greška',
@@ -277,23 +310,33 @@
 'Invalid action': 'Invalid action',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'Nevažeća lozinka',
+'Invalid password': 'Invalid password',
 'invalid password.': 'nevažeća lozinka.',
 'Invalid Query': 'Pogrešan upit',
 'invalid request': 'invalid request',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'pogrešan tiket',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
 'Key bindings': 'Prečice',
 'Key bindings for ZenCoding Plugin': 'Prečice za ZenCoding Plugin',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Prečice na tastaturi',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': 'jezička datoteka "%(filename)s" je kreirana/ažurirana',
 'Language files (static strings) updated': 'Jezičke datoteke su ažurirane',
 'Languages': 'Jezici',
 'languages': 'jezici',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Posljednja izmjena:',
 'License for': 'Licenca za',
@@ -307,7 +350,11 @@
 'Local Apps': 'Lokalne aplikacije',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'Prijava',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Prijava za administrativno okruženje',
 'Login/Register': 'Prijava/Registracija',
@@ -330,10 +377,12 @@
 'modules': 'moduli',
 'Modules': 'Moduli',
 'Multi User Mode': 'Višekorisnički režim rada',
+'Name': 'Name',
 'new application "%s" created': 'nova aplikacija "%s" je kreirana',
 'new application "%s" imported': 'nova aplikacija "%s" je uvežena',
 'New application wizard': 'Čarobnjak za nove aplikacije',
 'New Application Wizard': 'Čarobnjak za nove aplikacije',
+'New password': 'New password',
 'new plugin installed': 'novi pomoćni modul je instaliran',
 'New plugin installed: %s': 'Instaliran novi pomoćni modul: %s',
 'New Record': 'Novi zapis',
@@ -354,6 +403,8 @@
 'Not Authorized': 'Nemate ovlašćenje',
 'Not supported': 'Nije podržano',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'onlajn dizajner',
 'Open new app in new window': 'Otvori novu aplikaciju u novom prozoru',
@@ -362,6 +413,7 @@
 'or alternatively': 'ili alternativno',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'ili uvezi pomoću csv datoteke',
+'Origin': 'Origin',
 'Original/Translation': 'Original/Prevod',
 'Overview': 'Pregled',
 'Overwrite installed app': 'Zamjeni već postojeću aplikaciju',
@@ -369,7 +421,12 @@
 'Pack compiled': 'Zapakuj kompajlirano',
 'Pack custom': 'Prilagođeno pakovanje',
 'pack plugin': 'zapakuj pomoćni modul',
+'Password': 'Password',
 'password changed': 'lozinka je promijenjena',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Prethodne korekcije',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -377,6 +434,7 @@
 'Permission': 'Dozvola',
 'Permissions': 'Dozvole',
 'Please': 'Molim',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'Pomoćni modul "%(plugin)s" je izbrisan',
 'Plugin "%s" in application': 'Pomoćni modul "%s" u aplikaciji',
@@ -393,6 +451,7 @@
 'Previous Edit Point': 'Previous Edit Point',
 'private files': 'privatne datoteke',
 'Private files': 'Privatne datoteke',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Napredak projekta',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -408,19 +467,35 @@
 'Ram Cleared': 'Ram Cleared',
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'record does not exist',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Obnovi preusmjerenja',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Remove compiled',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Zamijeni',
 'Replace All': 'Zamijeni sve',
 'Repository (%s)': 'Repozitorijum (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Resolve Conflict file',
 'response': 'response',
 'restart': 'restart',
@@ -457,6 +532,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Prikazujem %s do %s od %s %s pronađenih',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'Početna',
 'Size of cache:': 'Size of cache:',
@@ -505,7 +581,9 @@
 'There are no views': 'Nema stranica prikaza',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
@@ -517,6 +595,7 @@
 'Ticket ID': 'Tiket ID',
 'Ticket Missing': 'Nedostaje tiket',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'na prethodnu verziju.',
 'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -529,6 +608,7 @@
 'try something like': 'na primjer',
 'Try the mobile interface': 'Probaj mobilno okruženje',
 'try view': 'probaj prikaz',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Ne mogu da provjerim mogućnost nadogradnje',
@@ -542,6 +622,7 @@
 'Unable to download the list of plugins': 'Ne mogu da preuzmem spisak pomoćnih modula',
 'unable to install plugin "%s"': 'ne mogu da instaliram pomoćni modul "%s"',
 'unable to parse csv file': 'ne mogu da rasčlanim csv datoteku',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'ne mogu da deinstaliram "%s"',
 'unable to upgrade because "%s"': 'ne mogu da ažurimam zbog "%s"',
 'uncheck all': 'uncheck all',
@@ -560,10 +641,25 @@
 'upload plugin file:': 'preuzmi datoteku pomoćnog modula:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'User': 'Korisnik',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Korisničko ime',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Korisnici',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'promenljive',
+'Verify Password': 'Verify Password',
 'Version': 'Verzija',
 'Version %s.%s.%s (%s) %s': 'Verzija %s.%s.%s (%s) %s',
 'Versioning': 'Kreiranje verzija',
@@ -582,6 +678,7 @@
 'web2py Recent Tweets': 'web2py Recent Tweets',
 'web2py upgrade': 'web2py nadogradnja',
 'web2py upgraded; please restart it': 'web2py je ažuriran; molim da restartujete',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Working...': 'Izvršavam...',
 'Wrap with Abbreviation': 'Wrap with Abbreviation',
 'WSGI reference name': 'WSGI referentni naziv',
@@ -589,8 +686,13 @@
 'Yes': 'Da',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/tr.py

@@ -17,9 +17,23 @@
 '(version %s)': '(version %s)',
 '1: Setting Parameters': '1: Parametrelerin Yapılandırılması',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': '@markmin\x01Bir hata oluştu, lütfen sayfayı [[reload %s]]',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
 "@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "'%s' uygulaması için[[NEWLINE]]Mercurial Sürüm Kontrol Sistemi Arayüzü",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': '@markmin\x01Aranıyor: **%s** %%{file}',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available: %s': "web2py'nin yeni sürümü mevcut: %s ",
 'A new version of web2py is available: Version 1.68.2 (2009-10-21 09:59:29)\n': "web2py'nin yeni sürümü mevcut: Sürüm 1.68.2 (2009-10-21 09:59:29)\r\n",
 'Abort': 'Abort',
@@ -53,6 +67,7 @@
 'application is compiled and cannot be designed': 'uygulama derlenmiş ve tasarlanamaz',
 'Application name:': 'Uygulama adı:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'kullanılamıyor',
 'are not used yet': 'şimdilik kullanılamıyor',
 'Are you sure you want to delete file "%s"?': '«%s» dosyasını silmek istediğinize emin misiniz?',
@@ -68,6 +83,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'UYARI: Giriş günceli bağlantı (HTTPS) gerektirmekte veya yerel makinada çalışılmalıdır.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'UYARI: ÇOKLU TEST GÜVENLİ DEĞİL. BİRDEN ÇOK TESTİ AYNI ANDA YAPMAYIN.',
 'ATTENTION: you cannot edit the running application!': 'UYARI: çalışan uygulamayı düzenleyemezsiniz!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Python Kodlarını Otomatik Tamamla',
 'Available databases and tables': 'Kullanılabilir veritabanları ve tablolar',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -96,6 +112,7 @@
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'admin parolasını değiştir',
 'change editor settings': 'düzenleyici ayarlarını değiştir',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'tümünü kontrol et',
 'Check for upgrades': 'Güncellemeleri kontrol et',
@@ -106,9 +123,11 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Takibi genişletmek için satır üzerine tıkla',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': 'güncellemeleri denetlemek için tıklayın',
+'Client IP': 'Client IP',
 'code': 'kod',
 'Code listing': 'Code listing',
 'collapse/expand all': 'sıkıştır/tümünü aç',
@@ -168,6 +187,7 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Yayınlama formu',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'tadarla',
 'Detailed traceback description': 'Ayrıntılı nedenin bulma tanımı',
@@ -194,6 +214,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'eklentileri indir',
 'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
 'EDIT': 'DÜZENLE',
 'Edit': 'Düzenle',
 'edit all': 'tümünü düzenle',
@@ -209,6 +230,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Etkinleştir',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -251,8 +275,10 @@
 'filter': 'filtre',
 'Find Next': 'Sonrakini Bul',
 'Find Previous': 'Öncekini Bul',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Çerçeveler',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': '[passed] testlerdeki işlevlerde doctest yok',
 'GAE Email': 'GAE E-postası',
 'GAE Output': 'GAE Output',
@@ -267,6 +293,10 @@
 'Goto': 'Git',
 'graph model': 'grafik modeli',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'Yardım',
 'here': 'here',
 'Hide/Show Translated strings': 'Çevrilmiş cümleleri Gizle/Görüntüle',
@@ -284,6 +314,7 @@
 'Import/Export': 'İçe/Dışa Aktarıcı',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'içerir',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'index': 'indeks',
 'insert new': 'yeni ekle',
@@ -292,6 +323,7 @@
 'Install': 'Kurucu',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Kurulu uygulamalar',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'dahili hata',
@@ -300,24 +332,34 @@
 'Invalid action': 'Geçersiz eylem',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
+'Invalid email': 'Invalid email',
 'invalid expression': 'geçersiz ifade',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'Parola geçersiz',
+'Invalid password': 'Invalid password',
 'invalid password.': 'geçersiz parola.',
 'Invalid Query': 'Geçersiz Sorgu',
 'invalid request': 'geçersiz istek',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': 'geçersiz bilet',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
 'Key bindings': 'Anahtarlar',
 'Key bindings for ZenCoding Plugin': 'ZenCoding Eklentisi için anahtarlar',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': '"%(filename)s" dil dosyası/dosyaları güncellendi',
 'Language files (static strings) updated': 'Dil dosyası (statik cümleler) güncellendi',
 'languages': 'diller',
 'Languages': 'Diller',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Son kaydedilme:',
 'License for': 'için lisanslanmış',
@@ -331,8 +373,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'yereller',
 'Locals##debug': 'Yereller',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'Giriş',
 'login': 'giriş',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Yönetsel Arayüze Giriş\t',
 'Login/Register': 'Login/Register',
@@ -353,10 +399,12 @@
 'Modules': 'Modüller',
 'modules': 'modüller',
 'Multi User Mode': 'Multi User Mode',
+'Name': 'Name',
 'new application "%s" created': 'yeni uygulama "%s" oluşturuldu',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'Yeni Uygulama Sihirbazı',
 'New application wizard': 'Yeni uygulama sihirbazı',
+'New password': 'New password',
 'new plugin installed': 'yeni eklenti kuruldu',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Yeni Kayıt',
@@ -377,6 +425,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Not: Eğer github hata kodu 128 durumunu bildiren bir ileti alırsanız, OpenShift hesabınızı ait ssh anahtarının doğru yapılandırıldığından emin olun.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'online designer': 'çevirimiçi tasarlayıcı',
 'Open new app in new window': 'Yeni pencerede yeni uygualama aç',
@@ -387,6 +437,7 @@
 'or import from csv file': 'veya CSV dsoyasından içerin',
 'or provide app url:': "veya uygulama URL'si verin:",
 'or provide application url:': "veya uygulama URL'si verin:",
+'Origin': 'Origin',
 'Original/Translation': 'Orjinal / Çeviri',
 'Overview': 'Overview',
 'Overwrite installed app': 'Kurulu uygulama üzerine yaz',
@@ -395,7 +446,12 @@
 'Pack custom': 'Tercihli paketle',
 'pack plugin': 'eklentiyi paketle',
 'PAM authenticated user, cannot change password here': 'PAM onaylı kullanıcı, parola buradan değiştirilemiyor',
+'Password': 'Password',
 'password changed': 'parola değiştirilidi',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'appcfg.py dosyasının patikası',
 'Path to local openshift repo root.': 'Yerel openshift repo kökünün patikası.',
@@ -403,6 +459,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Lütfen',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': '"%(plugin)s" eklentisi silindi',
 'Plugin "%s" in application': '"%s" uygulamasında eklenti',
@@ -419,6 +476,7 @@
 'previous 100 rows': 'önceki 100 satır',
 'Private files': 'Özel dosyalar',
 'private files': 'özel dosyalar',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Proje İlerlemesi',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -435,20 +493,36 @@
 'Rapid Search': 'Hızlı Arama',
 'Record': 'Record',
 'record': 'kayıt',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'kayıt bulunamıyor',
 'record id': 'kayıt id',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'yeniden yükle',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Yönelendirmeyi yeniden yükle',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Derlemeyi kaldır',
 'Removed Breakpoint on %s at line %s': ' %s üzerindeki kesme noktası %s satırında değiştrildi.',
 'Replace': 'Değiştir',
 'Replace All': 'Tümünü değiştir',
 'Repository (%s)': 'Repository (%s)',
 'request': 'istek',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'python-git gerekyior, fakat kurulu değil',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Dosyadaki çakışmayı çöz',
 'response': 'tepki',
 'restart': 'yeniden başla',
@@ -487,6 +561,7 @@
 'Set Breakpoint on %s at line %s: %s': "%s'nin %s satırındaki kesme noktasını: %s yap",
 'shell': 'kabuk',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': 'Site',
 'Size of cache:': 'Size of cache:',
@@ -541,7 +616,9 @@
 'These files are not served, they are only available from within your app': 'Bu dosyalar servis yapılmıyor, bunlar sadece uygulamanız içerisinden erişilebilir.',
 'These files are served without processing, your images go here': 'Bu dosyalarda işlem yapılmadan kaydedildi, resimler buraya gidiyor:',
 'these files are served without processing, your images go here': 'bu dosyalarda işlem yapılmadan kaydedildi, resimler buraya gidiyor:',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': 'Bu şablonlar %(filename)s: ',
@@ -554,6 +631,7 @@
 'Ticket ID': "Bile ID'si",
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'TM': 'TM',
 'to  previous version.': 'önceki sürüme.',
 'To create a plugin, name a file/folder plugin_[name]': 'Eklenti oluşturmak için dosyayı dosya/klasör plugin_[isim] şeklinde isimlendir. ',
@@ -569,6 +647,7 @@
 'try something like': 'gibi birşey dene',
 'Try the mobile interface': 'Mobil arayüzü dene',
 'try view': 'görünümü dene',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': 'Güncellemeler denetlenemiyor',
@@ -585,6 +664,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': "impossible d'analyser les fichiers CSV",
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'kladıramıyor çünkü "%s"',
 'unable to upgrade because "%s"': 'güncelleyemiyor çünkü "%s"',
 'uncheck all': 'tümünü kladır',
@@ -610,10 +690,25 @@
 'Use an url:': "Url'yi kullan:",
 'user': 'kullanıcı',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'değişkenler',
+'Verify Password': 'Verify Password',
 'Version': 'Sürüm',
 'Versioning': 'Sürümleme',
 'versioning': 'sürümleme',
@@ -633,14 +728,20 @@
 'web2py Recent Tweets': 'web2py Son Twitler',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py güncellendi, lütfen yeniden başlatın',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI referans ismi',
 'YES': 'EVET',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': '"kesme noktaları" düğmesini kullanarak düzenleme penceresine geçebilir ve kesme nokatalarını hem ekeleyebilir hemde kaldırabilirsiniz',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'Gelinceye kadar kurmalısınız',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/uk.py

@@ -18,10 +18,23 @@
 '(something like "it-it")': '(щось схоже на "uk-ua")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(не існує файлу **gluon/contrib/plural_rules/%s.py**)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'Сталась помилка, будь-ласка [[переватажте %s]] сторінку',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
 "@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Інтерфейс системи контролю версій Mercurial[[NEWLINE]]для додатку '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Знайдено: **%s** %%{файл}',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'Abort': 'Припинити',
 'About': 'Про',
 'about': 'про',
@@ -53,6 +66,7 @@
 'application is compiled and cannot be designed': 'додаток скомпільований. налаштування змінювати не можна',
 'Application name:': 'Назва додатку:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'не використовуються',
 'are not used yet': 'поки що не використовуються',
 'Are you sure you want to delete file "%s"?': 'Ви впевнені, що хочете вилучити файл "%s"?',
@@ -67,6 +81,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!': 'УВАГА: Ви не можете редагувати додаток, який зараз виконуєте!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Автозавершення коду на Python',
 'Available databases and tables': 'Доступні бази даних та таблиці',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -95,6 +110,7 @@
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Змінити пароль адміністратора',
 'change editor settings': 'змінити налаштування редактора',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'відмітити всі',
 'Check for upgrades': 'Перевірити оновлення',
@@ -105,8 +121,10 @@
 'Clear CACHE?': 'Очистити ВЕСЬ кеш?',
 'Clear DISK': 'Очистити ДИСКОВИЙ КЕШ',
 'Clear RAM': "Очистити КЕШ В ПАМ'ЯТІ",
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': '"Клацніть" мишкою по рядку, щоб розгорнути стек викликів (traceback)',
 'Click row to view a ticket': 'Для перегляду позначки (ticket) "клацніть" мишкою по рядку',
+'Client IP': 'Client IP',
 'code': 'код',
 'Code listing': 'Лістинг',
 'collapse/expand all': 'згорнути/розгорнути все',
@@ -168,6 +186,7 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Форма розгортання (deployment form)',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'налаштування',
 'Detailed traceback description': 'Детальний опис стеку викликів (traceback)',
@@ -194,6 +213,7 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'завантажити втулки',
 'Download plugins from repository': 'Download plugins from repository',
+'E-mail': 'E-mail',
 'Edit': 'Редагувати',
 'edit all': 'редагувати всі',
 'Edit application': 'Налаштування додатку',
@@ -207,6 +227,9 @@
 'Editing Plural Forms File': 'Редагується файл форм множини',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Увімкнути',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -247,8 +270,10 @@
 'filter': 'фільтр',
 'Find Next': 'Шукати наступний',
 'Find Previous': 'Шукати попередній',
+'First name': 'First name',
 'Form has errors': 'Form has errors',
 'Frames': 'Стек викликів',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Функції, в яких відсутні док-тести відносяться до функцій, які успішно пройшли тести.',
 'GAE Email': 'Ел.пошта GAE',
 'GAE Output': 'Відповідь GAE',
@@ -265,6 +290,10 @@
 'Goto': 'Перейти до',
 'graph model': 'графова модель',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'Допомога',
 'here': 'here',
 'Hide/Show Translated strings': 'Сховати/показати ВЖЕ ПЕРЕКЛАДЕНІ рядки',
@@ -281,6 +310,7 @@
 'Import/Export': 'Імпорт/Експорт',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'Під час розробки , використовуйте вбудований веб-сервер Rocket, він найкраще налаштований на спільну роботу з інтерактивним ладначем.',
 'includes': 'включає',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'index': 'індекс',
 'insert new': 'вставити новий',
@@ -289,6 +319,7 @@
 'Install': 'Встановлення',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Встановлені додатки (applications)',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Виконується %s рядок %s',
 'Interactive console': 'Інтерактивна консоль',
 'internal error': 'внутрішня помилка',
@@ -298,24 +329,34 @@
 'Invalid application name': 'Invalid application name',
 'invalid circual reference': 'помилкове циклічне посилання',
 'invalid circular reference': 'помилкове циклічне посилання',
+'Invalid email': 'Invalid email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'неправильний пароль',
+'Invalid password': 'Invalid password',
 'invalid password.': 'неправильний пароль.',
 'Invalid Query': 'Помилковий запит',
 'invalid request': 'хибний запит',
 'Invalid request': 'Invalid request',
 'invalid request ': 'Хибний запит',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'хибна назва таблиці (таблиці auth_* вже оголошено)',
 'invalid ticket': 'недійсна позначка про помилку (ticket)',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Ключ',
 'Key bindings': 'Клавіатурні скорочення:',
 'Key bindings for ZenCoding Plugin': 'Клавіатурні скорочення для втулки ZenCoding plugin',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'вбити процес',
 'language file "%(filename)s" created/updated': 'Файл перекладу "%(filename)s" створено/оновлено',
 'Language files (static strings) updated': 'Файли перекладів (із статичних рядків в першоджерелах) оновлено',
 'languages': 'переклади',
 'Languages': 'Переклади',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Востаннє збережено:',
 'License for': 'Ліцензія додатку',
@@ -330,8 +371,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'локальні',
 'Locals##debug': 'Локальні змінні',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'Вхід',
 'login': 'вхід',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': 'Вхід в адміністративний інтерфейс',
 'Login/Register': 'Login/Register',
@@ -359,10 +404,12 @@
 'Must include at least %s lowercase': 'Повинен включати щонайменше %s малих букв',
 'Must include at least %s of the following : %s': 'Має включати не менше %s таких символів : %s',
 'Must include at least %s uppercase': 'Повинен включати щонайменше %s великих букв',
+'Name': 'Name',
 'new application "%s" created': 'новий додаток "%s" створено',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'Майстер створення нового додатку',
 'New application wizard': 'Майстер створення нового додатку',
+'New password': 'New password',
 'new plugin installed': 'нова втулка (plugin) встановлена',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'Новий запис',
@@ -384,6 +431,8 @@
 'Not Authorized': 'Не дозволено',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Примітка: Якщо ви отримали повідомлення про помилку з кодом стану github рівним 128, переконайтесь, що система та обліковий запис, з якого відбувається розгортання використовують відповідний ключ ssh, налаштований в обліковому записі openshift.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": 'У промисловій експлуатації, ви повинні налаштувати ваш веб-сервер на використання одного процесу та багатьох потоків, якщо бажаєте скористатись цим ладначем.',
 'online designer': 'дизайнер БД',
 'Open new app in new window': 'Open new app in new window',
@@ -392,6 +441,7 @@
 'or alternatively': 'або альтернативно',
 'Or Get from URL:': 'Або Отримати з мережі (ч/з URL):',
 'or import from csv file': 'або імпортувати через csv-файл',
+'Origin': 'Origin',
 'Original/Translation': 'Оригінал/переклад',
 'Overview': 'Overview',
 'Overwrite installed app': 'Перезаписати встановлений додаток',
@@ -400,7 +450,12 @@
 'Pack custom': 'Пакувати вибране',
 'pack plugin': 'запакувати втулку',
 'PAM authenticated user, cannot change password here': 'Ввімкнена система ідентифікації користувачів PAM. Для зміни паролю скористайтесь командами вашої ОС ',
+'Password': 'Password',
 'password changed': 'пароль змінено',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Шлях до appcfg.py',
 'Path to local openshift repo root.': 'Шлях до локального корня репозитарія openshift.',
@@ -409,6 +464,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Будь-ласка',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin': 'втулка',
 'plugin "%(plugin)s" deleted': 'втулку "%(plugin)s" вилучено',
@@ -427,6 +483,7 @@
 'Previous Edit Point': 'Попереднє місце редагування',
 'Private files': 'Приватні файли',
 'private files': 'приватні файли',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Поступ проекту',
 'Pull': 'Втягнути',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -443,21 +500,37 @@
 'Rapid Search': 'Миттєвий пошук',
 'Record': 'Record',
 'record': 'запис',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'запису не існує',
 'record id': 'Ід.запису',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'refresh': 'оновіть',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'reload': 'перевантажити',
 'Reload routes': 'Перезавантажити маршрути',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': 'Вилуч.компл',
 'Removed Breakpoint on %s at line %s': 'Вилучено точку зупинки у %s в рядку %s',
 'Replace': 'Замінити',
 'Replace All': 'Замінити все',
 'Repository (%s)': 'Repository (%s)',
 'request': 'запит',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'Для розгортання необхідний пакет python-git, але він не встановлений',
+'Reset Password key': 'Reset Password key',
 'resolve': "розв'язати",
 'Resolve Conflict file': "Файл розв'язування конфлікту",
 'response': 'відповідь',
@@ -500,6 +573,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Додано точку зупинки в %s на рядок %s: %s',
 'shell': 'консоль',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'signup': 'підписатись',
 'signup_requested': 'необхідна_реєстрація',
 'Singular Form': 'Форма однини',
@@ -553,7 +627,9 @@
 'There are no views': 'Відображень нема',
 'These files are not served, they are only available from within your app': 'Ці файли ніяк не обробляються, вони доступні тільки в межах вашого додатку',
 'These files are served without processing, your images go here': 'Ці файли обслуговуються "як є", без обробки, ваші графічні файли та інші супутні файли даних можуть знаходитись тут',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": 'Цей ладнач може працювати некоректно, якщо ви використовуєте веб-сервер без підтримки потоків або використовуєте декілька сервісних процесів.',
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'Це експериментальна властивість, яка вимагає подальшого тестування. Якщо ви вирішили повернутись на попередню версію, ви це робити на ваш власний розсуд.',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'Це експериментальна властивість, яка вимагає подальшого тестування. Якщо ви вирішили розпочати оновлення, ви це робите на ваш власний розсуд',
 'This is the %(filename)s template': 'Це шаблон %(filename)s',
@@ -568,6 +644,7 @@
 'Ticket Missing': 'Позначка (ticket) відсутня',
 'tickets': 'позначки (tickets)',
 'Time in Cache (h:m:s)': 'Час в кеші (г:хв:сек)',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'до попередньої версії.',
 'To create a plugin, name a file/folder plugin_[name]': 'Для створення втулки, назвіть файл/каталог plugin_[name]',
 'To emulate a breakpoint programatically, write:': 'Для встановлення точки зупинки  програмним чином напишіть:',
@@ -580,6 +657,7 @@
 'try something like': 'спробуйте щось схоже на',
 'Try the mobile interface': 'Спробуйте мобільний інтерфейс',
 'try view': 'дивитись результат',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'наберіть тут будь-які команди ладнача PDB і натисніть клавішу [Return] ([Enter]), щоб запустити їх на виконання.',
 'Type python statement in here and hit Return (Enter) to execute it.': 'Наберіть тут будь-які вирази Python і натисніть клавішу [Return] ([Enter]), щоб запустити їх на виконання.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
@@ -597,6 +675,7 @@
 'unable to install application "%(appname)s"': 'не вдається встановити додаток "%(appname)s"',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'не вдається розібрати csv-файл',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'не вдається вилучити "%s"',
 'unable to upgrade because "%s"': 'не вдається оновити, тому що "%s"',
 'unauthorized': 'неавторизовано',
@@ -620,11 +699,26 @@
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Для створення складних запитів використовуйте (...)&(...) замість AND, (...)|(...) замість OR, та ~(...) замість NOT.',
 'user': 'користувач',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Використання оболонки може заблокувати базу даних від сумісного використання іншими користувачами цього додатку.',
 'value not allowed': 'недопустиме значення',
 'variables': 'змінні',
+'Verify Password': 'Verify Password',
 'Version': 'Версія',
 'Version %s.%s.%s (%s) %s': 'Версія %s.%s.%s (%s) %s',
 'Versioning': 'Контроль версій',
@@ -644,6 +738,7 @@
 'web2py Recent Tweets': 'Останні твіти web2py',
 'web2py upgrade': 'оновлення web2py',
 'web2py upgraded; please restart it': 'web2py оновлено; будь-ласка перезапустіть його',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Working...': 'Working...',
 'Wrap with Abbreviation': 'Загорнути з абревіатурою',
 'WSGI reference name': "ім'я посилання WSGI",
@@ -652,9 +747,14 @@
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Ви також можете встановлювати/вилучати точки зупинок під час редагування першоджерел (sources), використовуючи кнопку "+/- точку зупинки"',
 'You can inspect variables using the console bellow': 'Ви можете досліджувати змінні, використовуючи інтерактивну консоль',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'У вас є ще одна спроба перед тим, як вхід буде заблоковано',
 'you must specify a name for the uploaded application': "ви повинні вказати ім'я додатка, перед ти, як завантажити його",
 'You need to set up and reach a': 'Треба встановити та досягнути',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Ваш додаток буде заблоковано, поки ви не клацнете по одній з кнопок керування ("наступний", "крок", "продовжити", та ін.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/zh-tw.py

@@ -15,7 +15,23 @@
 '(something like "it-it")': '(格式類似 "zh-tw")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': '新版的 web2py 已發行',
 'A new version of web2py is available: %s': '新版的 web2py 已發行: %s',
 'Abort': 'Abort',
@@ -50,6 +66,7 @@
 'application is compiled and cannot be designed': '應用程式已經編譯無法重新設計',
 'Application name:': 'Application name:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': '確定要刪除檔案"%s"?',
@@ -67,6 +84,7 @@
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': '注意: 因為在測試模式不保證多執行緒安全性，也就是說不可以同時執行多個測試案例',
 'ATTENTION: you cannot edit the running application!': '注意:不可編輯正在執行的應用程式!',
 'Authentication': '驗證',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': '可提供的資料庫和資料表',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -96,6 +114,7 @@
 'Change admin password': 'change admin password',
 'change editor settings': 'change editor settings',
 'Change Password': '變更密碼',
+'Change password': 'Change password',
 'change_password': '變更密碼',
 'Changelog': 'Changelog',
 'check all': '全選',
@@ -110,6 +129,7 @@
 'Clear RAM': 'Clear RAM',
 'click here for online examples': '點此處進入線上範例',
 'click here for the administrative interface': '點此處進入管理介面',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': '點擊打勾以便升級',
@@ -226,6 +246,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -266,6 +289,7 @@
 'First name': '名',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': '沒有 doctests 的函式會顯示 [passed].',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -280,7 +304,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': '群組編號',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Hello World': '嗨! 世界',
 'Help': '說明檔',
 'here': 'here',
@@ -299,6 +326,7 @@
 'Import/Export': '匯入/匯出',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': '包含',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'Index': '索引',
 'index': '索引',
@@ -308,6 +336,7 @@
 'Install': '安裝',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': '已安裝應用程式',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': '內部錯誤',
@@ -318,14 +347,22 @@
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': '不合法的電子郵件',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': '密碼錯誤',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': '不合法的查詢',
 'invalid request': '不合法的網路要求(request)',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': '不合法的問題單號',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': '語言檔"%(filename)s"已創建或更新',
@@ -347,8 +384,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'login': '登入',
 'Login': '登入',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': '登入到管理員介面',
 'Login/Register': 'Login/Register',
@@ -376,6 +417,7 @@
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
+'New password': 'New password',
 'new plugin installed': '已安裝新插件',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': '新紀錄',
@@ -395,6 +437,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
@@ -414,7 +458,10 @@
 'PAM authenticated user, cannot change password here': 'PAM 授權使用者, 無法在此變更密碼',
 'Password': '密碼',
 'password changed': '密碼已變更',
+'Password changed': 'Password changed',
 "Password fields don't match": '密碼欄不匹配',
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -423,6 +470,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin': '插件',
 'plugin "%(plugin)s" deleted': '已刪除插件"%(plugin)s"',
@@ -440,6 +488,7 @@
 'previous 100 rows': '往前 100 筆',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -456,14 +505,25 @@
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
 'record': '紀錄',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': '紀錄不存在',
 'record id': '紀錄編號',
 'Record ID': '紀錄編號',
 'Record id': 'Record id',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': '註冊',
 'Register': '註冊',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': '註冊金鑰',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
 'Remember me (for 30 days)': '記住帳號(30 天)',
 'Remove compiled': '編譯檔案已移除',
@@ -472,6 +532,7 @@
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
 'Reset Password key': '重設密碼',
@@ -514,6 +575,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': '命令列操作介面',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': '網站',
 'Size of cache:': 'Size of cache:',
@@ -570,7 +632,9 @@
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': '這些檔案保留未經處理,你的影像檔在此',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': '這是%(filename)s檔案的樣板(template)',
@@ -600,6 +664,7 @@
 'try something like': '嘗試如',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': '無法做升級檢查',
@@ -616,6 +681,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': '無法解析逗號分隔檔(csv)',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': '無法移除安裝 "%s"',
 'unable to upgrade because "%s"': '無法升級因為 "%s"',
 'uncheck all': '全不選',
@@ -639,10 +705,21 @@
 'upload plugin file:': '上傳插件檔:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': '使用下列方式來組合更複雜的條件式, (...)&(...) 代表同時存在的條件, (...)|(...) 代表擇一的條件, ~(...)則代表反向條件.',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
 'User %(id)s Logged-in': '使用者 %(id)s 已登入',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
 'User %(id)s Registered': '使用者 %(id)s 已註冊',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': '使用者編號',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
@@ -667,6 +744,7 @@
 'web2py Recent Tweets': 'web2py 最近的 Tweets',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': '已升級 web2py ; 請重新啟動',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome %s': '歡迎 %s',
 'Welcome to web2py': '歡迎使用 web2py',
 'Working...': 'Working...',
@@ -675,8 +753,13 @@
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/languages/zh.py

@@ -19,7 +19,23 @@
 '(something like "it-it")': '(就酱 "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+"@markmin\x01Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.': 'Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01You need to set up and reach a [[breakpoint %s]] to use the debugger!': 'You need to set up and reach a [[breakpoint %s]] to use the debugger!',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': '新版本web2py已经可用',
 'A new version of web2py is available: %s': '新版本web2py已经可用: %s',
 'Abort': 'Abort',
@@ -53,6 +69,7 @@
 'application is compiled and cannot be designed': '应用已编译完无法设计',
 'Application name:': 'Application name:',
 'Application updated via git pull': 'Application updated via git pull',
+'Apply changes': 'Apply changes',
 'are not used': 'are not used',
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete file "%s"?': '你真想删除文件"%s"?',
@@ -69,6 +86,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': '',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': '',
 'ATTENTION: you cannot edit the running application!': '注意: 不能修改正在运行中的应用!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': '可用数据库/表',
 'Available Databases and Tables': 'Available Databases and Tables',
@@ -90,7 +108,7 @@
 'can be a git repo': 'can be a git repo',
 'Cancel': 'Cancel',
 'Cannot be empty': '不能不填',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': '无法编译: 应用中有错误,请修订后再试.',
+'Cannot compile: there are errors in your app. \xa0 \xa0 \xa0 \xa0Debug it, correct errors and try again.': '无法编译: 应用中有错误,请修订后再试.',
 'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
 'cannot create file': '无法创建文件',
 'cannot upload file "%(filename)s"': '无法上传文件 "%(filename)s"',
@@ -98,6 +116,7 @@
 'Change admin password': 'change admin password',
 'change editor settings': 'change editor settings',
 'Change Password': '修改密码',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': '检查所有',
 'Check for upgrades': 'check for upgrades',
@@ -110,6 +129,7 @@
 'Clear RAM': 'Clear RAM',
 'click here for online examples': '猛击此处，查看在线实例',
 'click here for the administrative interface': '猛击此处，进入管理界面',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Click row to expand traceback': 'Click row to expand traceback',
 'Click row to view a ticket': 'Click row to view a ticket',
 'click to check for upgrades': '猛击查看是否有升级版本',
@@ -220,6 +240,9 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
@@ -262,6 +285,7 @@
 'First name': '姓',
 'Form has errors': 'Form has errors',
 'Frames': 'Frames',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': '',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -277,7 +301,10 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': '组ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Hello World': '道可道，非常道；名可名，非常名',
 'Help': '帮助',
 'here': 'here',
@@ -296,6 +323,7 @@
 'Import/Export': '导入/导出',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': '包含',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
 'insert new': '新插入',
 'insert new %s': '新插入 %s',
@@ -303,6 +331,7 @@
 'Install': 'install',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': '已安装的应用',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': '内部错误',
@@ -313,14 +342,22 @@
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': '无效的email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': '无效密码',
+'Invalid password': 'Invalid password',
 'invalid password.': 'invalid password.',
 'Invalid Query': '无效查询',
 'invalid request': '无效请求',
 'Invalid request': 'Invalid request',
+'Invalid reset password': 'Invalid reset password',
 'invalid table names (auth_* tables already defined)': 'invalid table names (auth_* tables already defined)',
 'invalid ticket': '无效传票',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Keyboard shortcuts': 'Keyboard shortcuts',
 'kill process': 'kill process',
 'language file "%(filename)s" created/updated': '语言文件 "%(filename)s"被创建/更新',
@@ -342,8 +379,12 @@
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'login': '登录',
 'Login': '登录',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Login successful': 'Login successful',
 'Login to the Administrative Interface': '登录到管理员界面',
 'Login/Register': 'Login/Register',
@@ -370,6 +411,7 @@
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
+'New password': 'New password',
 'new plugin installed': 'new plugin installed',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': '新记录',
@@ -389,6 +431,8 @@
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.": "On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.",
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
@@ -409,6 +453,10 @@
 'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
 'Password': '密码',
 'password changed': 'password changed',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Past revisions': 'Past revisions',
 'Path to appcfg.py': 'Path to appcfg.py',
 'Path to local openshift repo root.': 'Path to local openshift repo root.',
@@ -416,6 +464,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
+'please input your password again': 'please input your password again',
 'Please wait, giving pythonanywhere a moment...': 'Please wait, giving pythonanywhere a moment...',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" deleted',
 'Plugin "%s" in application': 'Plugin "%s" in application',
@@ -432,6 +481,7 @@
 'previous 100 rows': '前100行',
 'Private files': 'Private files',
 'private files': 'private files',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Project Progress',
 'Pull': 'Pull',
 'Pull failed, certain files could not be checked out. Check logs for details.': 'Pull failed, certain files could not be checked out. Check logs for details.',
@@ -448,23 +498,37 @@
 'Rapid Search': 'Rapid Search',
 'Record': 'Record',
 'record': 'record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': '记录并不存在',
 'record id': '记录ID',
 'Record ID': '记录ID',
 'Record id': 'Record id',
+'Record Updated': 'Record Updated',
 'refresh': 'refresh',
 'register': 'register',
 'Register': '注册',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': '注册密匙',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
 'Remove compiled': '已移除',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
 'Repository (%s)': 'Repository (%s)',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'requires distutils, but not installed': 'requires distutils, but not installed',
 'requires python-git, but not installed': 'requires python-git, but not installed',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': '解决冲突文件',
 'response': 'response',
 'restart': 'restart',
@@ -503,6 +567,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': '',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Singular Form',
 'Site': '总站',
 'Size of cache:': 'Size of cache:',
@@ -558,7 +623,9 @@
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': '',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.": "This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.",
+'This email already has an account': 'This email already has an account',
 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk',
 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
 'This is the %(filename)s template': '这是 %(filename)s 模板',
@@ -577,7 +644,7 @@
 'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
 'to use the debugger!': 'to use the debugger!',
-'to  previous version.': '退回前一版本',
+'to \xa0previous version.': '退回前一版本',
 'toggle breakpoint': 'toggle breakpoint',
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
@@ -588,6 +655,7 @@
 'try something like': '尝试',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'Type PDB debugger command in here and hit Return (Enter) to execute it.',
 'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
 'Unable to check for upgrades': '无法检查是否需要升级',
@@ -604,6 +672,7 @@
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': '无法生成 cvs',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': '无法卸载 "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': '反选全部',
@@ -625,14 +694,28 @@
 'upload file:': '提交文件:',
 'upload plugin file:': 'upload plugin file:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': '',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...) \xa0for NOT to build more complex queries.': '',
 'Use an url:': 'Use an url:',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': '用户ID',
 'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Using the shell may lock the database to other users of this app.': 'Using the shell may lock the database to other users of this app.',
 'variables': 'variables',
+'Verify Password': 'Verify Password',
 'Version': '版本',
 'Versioning': 'Versioning',
 'versioning': '版本',
@@ -652,6 +735,7 @@
 'web2py Recent Tweets': 'twitter上的web2py进展实播',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome to web2py': '欢迎使用web2py',
 'Working...': 'Working...',
 'WSGI reference name': 'WSGI reference name',
@@ -659,8 +743,13 @@
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You have one more login attempt before you are locked out': 'You have one more login attempt before you are locked out',
 'You need to set up and reach a': 'You need to set up and reach a',
 'You only need these if you have already registered': 'You only need these if you have already registered',
 'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/admin/models/0_imports.py

@@ -25,6 +25,5 @@ from gluon.utils import md5_hash
 from gluon.fileutils import listdir, cleanpath, up
 from gluon.fileutils import tar, tar_compiled, untar, fix_newlines
 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

applications/admin/models/access.py

@@ -52,7 +52,7 @@ def verify_password(password):
     if DEMO_MODE:
         ret = True
     elif not _config.get('password'):
-        ret - False
+        ret = False
     elif _config['password'].startswith('pam_user:'):
         session.pam_user = _config['password'][9:].strip()
         import gluon.contrib.pam

applications/admin/settings.cfg

@@ -1,9 +1,12 @@
-[DEFAULT]
-
 [editor]
-theme = web2py
+theme = twilight
-editor = default
+editor = sublime
 closetag = true
+tabwidth = 4
+highlightline = true
+linenumbers = true
+codefolding = false
+indentwithtabs = false
 
 [editor_sessions]
 welcome = welcome/models/db.py,welcome/controllers/default.py,welcome/views/default/index.html

applications/admin/static/css/d3_graph.css

@@ -0,0 +1,33 @@
+    .node {fill: steelblue;
+           stroke: #636363;
+           stroke-width: 1px;}
+
+    .auth {fill: lightgrey;}
+
+    .table {r: 10;}
+
+    .link {stroke: #bbbbbb;
+           stroke-width: 2px;}
+    td {padding: 4px;}
+
+    div.tooltip {
+       position: absolute;
+       text-align: left;
+       /* width: 140px; */
+       /* height: 28px;*/
+       padding: 0px 5px 0px 5px;
+       padding-top: 0px;
+       font: 12px sans-serif;
+       background: #fff7bc;
+       border: solid 1px #aaa;
+       border-radius: 6px;
+       pointer-events: none;}
+
+    h5 { font: 14px sans-serif;
+         background : #ec7014;
+         color: #ffffe5; 
+         padding: 5px 2px 5px 2px;
+         margin-top: 1px;}
+    path {
+           fill: #aaaaaa;}
+

applications/admin/static/js/d3_graph.js

@@ -0,0 +1,181 @@
+function d3_graph() {
+
+// Some reference links:
+//   How to get link ids instead of index
+//     http://stackoverflow.com/questions/23986466/d3-force-layout-linking-nodes-by-name-instead-of-index
+//   embedding web2py in d3
+//     http://stackoverflow.com/questions/34326343/embedding-d3-js-graph-in-a-web2py-bootstrap-page
+
+// nodes and links are defined in appadmin.html <script>
+
+
+    var edges = [];
+
+    links.forEach(function(e) {
+        var sourceNode = nodes.filter(function(n) {
+            return n.name === e.source;
+        })[0],
+            targetNode = nodes.filter(function(n) {
+            return n.name === e.target;
+        })[0];
+
+        edges.push({
+            source: sourceNode,
+            target: targetNode,
+            value: 1});
+
+    });
+
+    edges.forEach(function(e) {
+
+        if (!e.source["linkcount"]) e.source["linkcount"] = 0;
+        if (!e.target["linkcount"]) e.target["linkcount"] = 0;
+
+        e.source["linkcount"]++;
+        e.target["linkcount"]++;
+    });
+
+    //var width = 960, height = 600;
+    var height = window.innerHeight|| docEl.clientHeight|| bodyEl.clientHeight;
+    var width = window.innerWidth || docEl.clientWidth || bodyEl.clientWidth;
+    var svg = d3.select("#vis").append("svg")
+            .attr("width", width)
+            .attr("height", height);
+
+       // updated for d3 v4.
+    var simulation = d3.forceSimulation()
+            .force("link", d3.forceLink().id(function(d) { return d.id; }))
+            .force("charge", d3.forceManyBody().strength(strength))
+            .force("center", d3.forceCenter(width / 2, height / 2))
+            .force("collision", d3.forceCollide(35));
+
+    // Node charge strength.  Repel strength greater for less links.
+    //function strength(d) { return -50/d["linkcount"] ; }
+    function strength(d) { return -25 ; }  
+    
+    // Link distance.  Distance increases with number of links at source and target
+    function distance(d) { return (60 + (d.source["linkcount"] * d.target["linkcount"])) ; }
+    
+    // Link strength.  Strength is less for highly connected nodes (move towards target dist)
+    function strengthl(d) { return 5/(d.source["linkcount"] + d.target["linkcount"]) ; }
+
+    simulation
+        .nodes(nodes)
+        .on("tick", tick);
+
+    simulation.force("link")
+        .links(edges)
+        .distance(distance)
+        .strength(strengthl);
+
+    // build the arrow.
+    svg.append("svg:defs").selectAll("marker")
+        .data(["end"])      // Different link/path types can be defined here
+        .enter().append("svg:marker")    // This section adds in the arrows
+        .attr("id", String)
+        .attr("viewBox", "0 -5 10 10")
+        .attr("refX", 25)   // Moves the arrow head out, allow for radius
+        .attr("refY", 0)   // -1.5
+        .attr("markerWidth", 6)
+        .attr("markerHeight", 6)
+        .attr("orient", "auto")
+        .append("svg:path")
+        .attr("d", "M0,-5L10,0L0,5");
+
+    var link = svg.selectAll('.link')
+        .data(edges)
+        .enter().append('line')
+        .attr("class", "link")
+        .attr("marker-end", "url(#end)");
+
+    var node = svg.selectAll(".node")
+        .data(nodes)
+        .enter().append("g")
+        .attr("class", function(d) { return "node " + d.type;})
+        .attr('transform', function(d) {
+            return "translate(" + d.x + "," + d.y + ")"})
+        .classed("auth", function(d) { return (d.name.startsWith("auth") ? true : false);});
+
+    node.call(d3.drag()
+            .on("start", dragstarted)
+            .on("drag", dragged)
+            .on("end", dragended));
+
+    // add the nodes
+    node.append('circle')
+        .attr('r', 16)
+        ;
+
+    // add text
+    node.append("text")
+        .attr("x", 12)
+        .attr("dy", "-1.1em")
+        .text(function(d) {return d.name;});
+
+    node.on("mouseover", function(d) {
+
+        var g = d3.select(this);  // the node (table)
+
+        // tooltip
+
+        var fields = d.fields;
+        var fieldformat = "<TABLE>";
+        fields.forEach(function(d) {
+            fieldformat += "<TR><TD><B>"+ d.name+"</B></TD><TD>"+ d.type+"</TD><TD>"+ d.disp+"</TD></TR>";
+        });
+        fieldformat += "</TABLE>";
+        var tiplength = d.fields.length;
+
+        // Define 'div' for tooltips
+        var div = d3.select("body").append("div")  // declare the tooltip div
+	        .attr("class", "tooltip")              // apply the 'tooltip' class
+            .style("opacity", 0)
+            .html('<h5>' + d.name + '</h5>' + fieldformat)
+            .style("left", 20 + (d3.event.pageX) + "px")// or just (d.x + 50 + "px")
+            .style("top", tooltop(tiplength))// or ...
+            .transition()
+            .duration(800)
+            .style("opacity", 0.9);
+        });
+
+        function tooltop(tiplength) {
+           //aim to ensure tooltip is fully visible whenver possible
+           return (Math.max(d3.event.pageY - 20 - (tiplength * 14),0)) + "px"
+        }
+
+        node.on("mouseout", function(d) {
+            d3.select("body").select('div.tooltip').remove();
+    });
+
+    // instead of waiting for force to end with :     force.on('end', function()
+    // use .on("tick",  instead.  Here is the tick function
+    function tick() {
+        node.attr('transform', function(d) {
+            d.x = Math.max(30, Math.min(width - 16, d.x));
+            d.y = Math.max(30, Math.min(height - 16, d.y));
+            return "translate(" + d.x + "," + d.y + ")"; });
+
+        link.attr('x1', function(d) {return d.source.x;})
+            .attr('y1', function(d) {return d.source.y;})
+            .attr('x2', function(d) {return d.target.x;})
+            .attr('y2', function(d) {return d.target.y;});
+    };
+
+    function dragstarted(d) {
+        if (!d3.event.active) simulation.alphaTarget(0.3).restart();
+        d.fx = d.x;
+        d.fy = d.y;
+    };
+
+    function dragged(d) {
+        d.fx = d3.event.x;
+        d.fy = d3.event.y;
+    };
+
+    function dragended(d) {
+        if (!d3.event.active) simulation.alphaTarget(0);
+        d.fx = null;
+        d.fy = null;
+    };
+
+};

applications/admin/static/js/web2py.js

@@ -12,6 +12,10 @@
         $.error('web2py.js has already been loaded!');
     }
 
+    var FORMDATA_IS_SUPPORTED = typeof(FormData) !== 'undefined';
+    var animateIn = 'fadeIn';
+    // var animateIn = 'slideDown';
+
     String.prototype.reverse = function () {
         return this.split('').reverse().join('');
     };
@@ -38,8 +42,12 @@
             if (value > 0) $('#' + id).hide().fadeIn('slow');
             else $('#' + id).show().fadeOut('slow');
         },
-        ajax: function (u, s, t) {
+        ajax: function (u, s, t, options) {
             /*simple ajax function*/
+
+            // set options default value
+            options = typeof options !== 'undefined' ? options : {};
+
             var query = '';
             if (typeof s == 'string') {
                 var d = $(s).serialize();
@@ -59,18 +67,44 @@
                     query = pcs.join('&');
                 }
             }
-            $.ajax({
+
+            // default success action
+            var success_function = function (msg) {
+                if (t) {
+                    if (t == ':eval') eval(msg);
+                    else if (typeof t == 'string') $('#' + t).html(msg);
+                    else t(msg);
+                }
+            };
+
+            // declare success actions as array
+            var success = [success_function];
+
+            // add user success actions
+            if ($.isArray(options.done)){
+                success = $.merge(success, options.done);
+            } else {
+                success.push(options.done);
+            }
+
+            // default jquery ajax options
+            var ajax_options = {
                 type: 'POST',
                 url: u,
                 data: query,
-                success: function (msg) {
+                success: success
-                    if (t) {
+            };
-                        if (t == ':eval') eval(msg);
+
-                        else if (typeof t == 'string') $('#' + t).html(msg);
+            //remove custom "done" option if exists
-                        else t(msg);
+            delete options.done;
-                    }
+
-                }
+            // merge default ajax options with user custom options
-            });
+            for (var attrname in options) {
+                    ajax_options[attrname] = options[attrname];
+            }
+
+            // call ajax function
+            $.ajax(ajax_options);
         },
         ajax_fields: function (target) {
             /*
@@ -148,7 +182,7 @@
         },
         /* manage errors in forms */
         manage_errors: function (target) {
-            $('div.error', target).hide().slideDown('slow');
+            $('div.error', target).hide()[animateIn]('slow');
         },
         after_ajax: function (xhr) {
             /* called whenever an ajax request completes */
@@ -233,19 +267,24 @@
                 }
             });
             /* help preventing double form submission for normal form (not LOADed) */
-            $(doc).on('submit', 'form', function () {
+            $(doc).on('submit', 'form', function (e) {
-                var submit_button = $(this).find(web2py.formInputClickSelector);
+                var submit_buttons = $(this).find(web2py.formInputClickSelector);
-                web2py.disableElement(submit_button);
+                submit_buttons.each(function() {
+                    web2py.disableElement($(this));
+                })
                 /* safeguard in case the form doesn't trigger a refresh,
                 see https://github.com/web2py/web2py/issues/1100 */
                 setTimeout(function () {
-                    web2py.enableElement(submit_button);
+                    submit_buttons.each(function() {
+                        web2py.enableElement($(this));
+                    });
                 }, 5000);
             });
             doc.ajaxSuccess(function (e, xhr) {
                 var redirect = xhr.getResponseHeader('web2py-redirect-location');
                 if (redirect !== null) {
                     window.location = redirect;
+                    window.location.reload(); // Force reload even with anchors
                 }
                 /* run this here only if this Ajax request is NOT for a web2py component. */
                 if (xhr.getResponseHeader('web2py-component-content') === null) {
@@ -290,7 +329,15 @@
                 form.submit(function (e) {
                     web2py.disableElement(form.find(web2py.formInputClickSelector));
                     web2py.hide_flash();
-                    web2py.ajax_page('post', url, form.serialize(), target, form);
+
+                    var formData;
+                    if (FORMDATA_IS_SUPPORTED) {
+                        formData = new FormData(form[0]); // Allows file uploads.
+                    } else {
+                        formData = form.serialize(); // Fallback for older browsers.
+                    }
+                    web2py.ajax_page('post', url, formData, target, form);
+
                     e.preventDefault();
                 });
                 form.on('click', web2py.formInputClickSelector, function (e) {
@@ -309,11 +356,18 @@
             if (web2py.isUndefined(element)) element = $(document);
             /* if target is not there, fill it with something that there isn't in the page*/
             if (web2py.isUndefined(target) || target === '') target = 'w2p_none';
+
+            /* processData and contentType must be set to false when passing a FormData
+               object to jQuery.ajax. */
+            var isFormData = Object.prototype.toString.call(data) === '[object FormData]';
+            var contentType = isFormData ? false : 'application/x-www-form-urlencoded; charset=UTF-8';
             if (web2py.fire(element, 'ajax:before', null, target)) { /*test a usecase, should stop here if returns false */
                 $.ajax({
                     'type': method,
                     'url': action,
                     'data': data,
+                    'processData': !isFormData,
+                    'contentType': contentType,
                     'beforeSend': function (xhr, settings) {
                         xhr.setRequestHeader('web2py-component-location', document.location);
                         xhr.setRequestHeader('web2py-component-element', target);
@@ -564,8 +618,8 @@
         flash: function (message, status) {
             var flash = $('.w2p_flash');
             web2py.hide_flash();
-            flash.html(message).addClass(status);
+            flash.text(message).addClass(status);
-            if (flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown();
+            if (flash.html()) flash.append('<span id="closeflash"> &times; </span>')[animateIn]();
         },
         hide_flash: function () {
             $('.w2p_flash').fadeOut(0).html('');
@@ -579,7 +633,7 @@
                 for (var k = 0; k < triggers[id].length; k++) {
                     var dep = $('#' + triggers[id][k], target);
                     var tr = $('#' + triggers[id][k] + '__row', target);
-                    if (t.is(dep.attr('data-show-if'))) tr.slideDown();
+                    if (t.is(dep.attr('data-show-if'))) tr[animateIn]();
                     else tr.hide();
                 }
             };
@@ -669,8 +723,9 @@
             });
         },
         /* Disables form elements:
+        - Does not disable elements with 'data-w2p_disable' attribute
         - Caches element value in 'w2p_enable_with' data store
-        - Replaces element text with value of 'data-disable-with' attribute
+        - Replaces element text with value of 'data-w2p_disable_with' attribute
         - Sets disabled property to true
         */
         disableFormElements: function (form) {
@@ -682,13 +737,15 @@
                 if (!web2py.isUndefined(disable)) {
                     return false;
                 }
-                if (web2py.isUndefined(disable_with)) {
+                if (!element.is(':file')) { // Altering file input values is not allowed.
-                    element.data('w2p_disable_with', element[method]());
+                    if (web2py.isUndefined(disable_with)) {
+                        element.data('w2p_disable_with', element[method]());
+                    }
+                    if (web2py.isUndefined(element.data('w2p_enable_with'))) {
+                        element.data('w2p_enable_with', element[method]());
+                    }
+                    element[method](element.data('w2p_disable_with'));
                 }
-                if (web2py.isUndefined(element.data('w2p_enable_with'))) {
-                    element.data('w2p_enable_with', element[method]());
-                }
-                element[method](element.data('w2p_disable_with'));
                 element.prop('disabled', true);
             });
         },
@@ -769,4 +826,4 @@ web2py_event_handlers = jQuery.web2py.event_handlers;
 web2py_trap_link = jQuery.web2py.trap_link;
 web2py_calc_entropy = jQuery.web2py.calc_entropy;
 */
-/* compatibility code - end*/
+/* compatibility code - end*/

applications/admin/static/js/web2py_bootstrap.js

@@ -29,5 +29,14 @@ jQuery(function(){
   }
   hoverMenu(); // first page load
   jQuery(window).resize(hoverMenu); // on resize event
-  jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
+  jQuery('ul.nav li.dropdown a').click(function(){ 
+    if(jQuery(this).attr("target")){
+        window.open(
+            jQuery(this).attr('href'),
+            jQuery(this).attr('target') // <- This is what makes it open in a new window.
+        );
+    } else {
+        window.location=jQuery(this).attr('href'); 
+    }
+  });
 });

applications/admin/views/appadmin.html

@@ -9,16 +9,19 @@
 });
 //--></script>
 
+<div class="row">
+  <div class="col-md-12">
+
 {{if request.function=='index':}}
 <h2>{{=T("Available Databases and Tables")}}</h2>
   {{if not databases:}}{{=T("No databases in this application")}}{{pass}}
   <ul class="nav nav-tabs" id="myTab">
-  <li class="active" ><a href="#alltables" data-toggle="tab">Tables</a></li>
+    <li class="nav-item"><a href="#alltables" data-toggle="tab" class="nav-link active">Tables</a></li>
-  <li><a href="#hooks" data-toggle="tab">Hooks</a></li>
+    <li class="nav-item"><a href="#hooks" data-toggle="tab" class="nav-link">Hooks</a></li>
   </ul>
   <div class="tab-content">
       <div class="tab-pane active" id="alltables">
-        <table class="table">
+        <table class="table table-striped">
           {{for db in sorted(databases):}}
             {{for table in databases[db].tables:}}
               {{qry='%s.%s.id>0'%(db,table)}}
@@ -37,10 +40,10 @@
               {{pass}}
           <tr>
             <th style="font-size: 1.75em;">
-              {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
+              &raquo; {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
             </th>
             <td>
-              {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn btn-default")}}
+              {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn btn-primary")}}
             </td>
           </tr>
           {{pass}}
@@ -61,28 +64,31 @@
   </pre>
   {{pass}}
   {{if table:}}
-  {{=A(str(T('New Record')),_href=URL('insert',args=[request.args[0],table]),_class="btn btn-default")}}<br/><br/>
+  {{=A(str(T('New Record')),_href=URL('insert',args=[request.args[0],table]),_class="btn btn-primary", _role="button")}}<br/><br/>
+  <hr />
     <h3>{{=T("Rows in Table")}}</h3><br/>
    {{else:}}
     <h3>{{=T("Rows selected")}}</h3><br/>
    {{pass}}
    {{=form}}
-   <p>{{=T('The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.')}}<br/>
+   <p class="text-muted">{{=T('The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.')}}<br/>
       {{=T('Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.')}}<br/>
       {{=T('"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN')}}</p>
     <br/><br/>
     <h4>{{=T("%s selected", nrows)}}</h4>
-    {{if start>0:}}{{=A(T('previous %s rows') % step,_href=URL('select',args=request.args[0],vars=dict(start=start-step)),_class="btn btn-default")}}{{pass}}
+    {{if start>0:}}{{=A(T('previous %s rows') % step,_href=URL('select',args=request.args[0],vars=dict(start=start-step)),_class="btn btn-primary")}}{{pass}}
-    {{if stop<nrows:}}{{=A(T('next %s rows') % step,_href=URL('select',args=request.args[0],vars=dict(start=start+step)),_class="btn btn-default")}}{{pass}}
+    {{if stop<nrows:}}{{=A(T('next %s rows') % step,_href=URL('select',args=request.args[0],vars=dict(start=start+step)),_class="btn btn-primary")}}{{pass}}
     {{if rows:}}
        <div style="overflow:auto; width:80%;">
        {{linkto = lambda f, t, r: URL('update', args=[request.args[0], r, f]) if f else "#"}}
        {{upload=URL('download',args=request.args[0])}}
-       {{=SQLTABLE(rows,linkto,upload,orderby=True,_class='sortable')}}
+       {{=SQLTABLE(rows,linkto,upload,orderby=True,_class='table table-striped table-bordered sortable')}}
        </div>
     {{pass}}
-    <br/><br/><h3>{{=T("Import/Export")}}</h3><br/>
+    <br/><br/>
-    <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn btn-default">{{=T("export as csv file")}}</a>
+    <hr />
+    <h3>{{=T("Import/Export")}}</h3><br/>
+    <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn btn-primary">{{=T("export as csv file")}}</a>
   {{=formcsv or ''}}
 
 {{elif request.function=='insert':}}
@@ -148,7 +154,7 @@
           {{=T.M("(**%.0d MB**)", total['bytes'] / 1048576)}}
         {{pass}}
       {{else:}}
-        {{=T.M("**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)")}}
+        {{=T.M("**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)")}}
       {{pass}}
     </p>
     <p>
@@ -176,7 +182,7 @@
           {{=T.M("(**%.0d MB**)", ram['bytes'] / 10485576)}}
         {{pass}}
       {{else:}}
-        {{=T.M("``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)")}}
+        {{=T.M("``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)")}}
       {{pass}}
     </p>
     <p>
@@ -205,7 +211,7 @@
           {{=T.M("(**%.0d MB**)", disk['bytes'] / 1048576)}}
         {{pass}}
       {{else:}}
-        {{=T.M("``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)")}}
+        {{=T.M("``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)")}}
       {{pass}}
       </p>
       <p>
@@ -233,30 +239,22 @@
 <div class="clear"></div>
 {{pass}}
 
-{{if request.function=='graph_model':}}
+{{if request.function=='d3_graph_model':}}
 <h2>{{=T("Graph Model")}}</h2>
-  {{if not pgv:}}
+  {{if not databases:}}  
-    {{=T('pygraphviz library not found')}}
-  {{elif not databases:}}
     {{=T("No databases in this application")}}
-  {{else:}}	   
+  {{else:}}    
-    <div class="btn-group">
+    <div id="vis"></div>
-      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+      <link rel="stylesheet" href="{{=URL('admin','static','css/d3_graph.css')}}"/>
-        <i class="icon-download"></i> {{=T('Save model as...')}}
+      <script>
-        <span class="caret"></span>
+        // Define the d3 input data
-      </a>
+        {{from gluon.serializers import json }}
-      <ul class="dropdown-menu">
+        var nodes = {{=XML(json(nodes))}};
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['png'])}}">png</a></li>
+        var links = {{=XML(json(links))}};
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['svg'])}}">svg</a></li>
+        d3_graph();
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['pdf'])}}">pdf</a></li>
+      </script>
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['ps'])}}">ps</a></li>
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['dot'])}}">dot</a></li>
-      </ul>
-    </div>
-    <br />
-    {{=IMG(_src=URL('appadmin', 'bg_graph_model'))}}
   {{pass}}
-{{pass}}
+{{pass}}  
 
 {{if request.function == 'manage':}}
 <h2>{{=heading}}</h2>
@@ -276,3 +274,6 @@
   {{pass}}
 </div>
 {{pass}}
+
+  </div>
+</div>

applications/admin/views/debug/interact.html

@@ -63,12 +63,12 @@
               <h3 class="not_paused">{{=T("No Interaction yet")}}</h3>
                 <div class="help span7 alert alert-block alert-info">
                   <ul class="unstyled">
-                    <li>{{=T("You need to set up and reach a")}} {{=A(T("breakpoint"), _href=URL('breakpoints'))}} {{=T('to use the debugger!')}}</li>
+                    <li>{{=T.M('You need to set up and reach a [[breakpoint %s]] to use the debugger!') % URL('breakpoints')}}</li>
                     <li>{{=T('To emulate a breakpoint programatically, write:')}}
                     {{=CODE("from gluon.debug import dbg\n"
                             "dbg.set_trace() # stop here!\n",
                             counter=None)}}</li>
-                    <li>{{=T('Please')}} {{=A(T("refresh"), _href=URL('interact'))}} {{=T('this page to see if a breakpoint was hit and debug interaction is required.')}}</li>
+                    <li>{{=T.M('Please [[refresh %s]] this page to see if a breakpoint was hit and debug interaction is required.') %URL('interact')}}</li>
                   </ul>
                 </div>
         {{pass}}

applications/admin/views/default.mobile/layout.html

@@ -34,7 +34,7 @@
     <link rel="stylesheet" href="{{=URL('static','plugin_jqmobile/jquery.mobile-1.3.1.min.css')}}">
 
     <!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
-    <script src="{{=URL('static','js/modernizr.custom.js')}}"></script!>
+    <script src="{{=URL('static','js/modernizr.custom.js')}}"></script>
 
     {{include 'web2py_ajax.html'}}
 

applications/admin/views/default.mobile/plugin.html

@@ -38,19 +38,19 @@ def file_upload_form(location):
               INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY()),
               INPUT(_type="hidden",_name="location",_value=location),
               INPUT(_type="hidden",_name="sender",_value=URL('design/'+app)),
-              INPUT(_type="submit",_value=T("submit")),_action=URL('upload_file'))
+              INPUT(_type="submit",_value=T("Submit")),_action=URL('upload_file'))
     return form
 def file_create_form(location):
     form=FORM(T("create file with filename:")," ",
               INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY()),
               INPUT(_type="hidden",_name="location",_value=location),
               INPUT(_type="hidden",_name="sender",_value=URL('design/'+app)),
-              INPUT(_type="submit",_value=T("submit")),_action=URL('create_file'))
+              INPUT(_type="submit",_value=T("Submit")),_action=URL('create_file'))
     return form
 def upload_plugin_form(app):
     form=FORM(T("upload plugin file:")," ",
               INPUT(_type="file",_name="pluginfile"),
-              INPUT(_type="submit",_value=T("submit")))
+              INPUT(_type="submit",_value=T("Submit")))
     return form
 def deletefile(arglist):
     return A_delete(SPAN(T('Delete')), _href=URL('delete',args=arglist,vars=dict(sender=request.function+'/'+app)))

applications/admin/views/default/design.html

@@ -105,7 +105,9 @@ def deletefile(arglist, vars={}):
         {{if os.access(os.path.join(request.folder,'..',app,'databases','sql.log'),os.R_OK):}}
             {{=button(URL('peek/%s/databases/sql.log'%app), 'sql.log')}}
         {{pass}}
-                {{=button(URL(a=app, c='appadmin',f='graph_model'), T('graph model'))}}
+        {{if os.access(os.path.join(request.folder,'..','admin','static','js','d3_graph.js'),os.R_OK):}}
+                {{=button(URL(a=app, c='appadmin',f='d3_graph_model'), T('graph model'))}}
+        {{pass}}
     </div>
     <ul class="unstyled act_edit">
         {{for m in models:}}

applications/admin/views/default/editor_settings.html

@@ -6,7 +6,7 @@
       return files
 }}
 {{themes = [f[:-4] for f in listfiles('admin', "static/codemirror/theme", regexp='.*\.css$' )]}}
-{{editors = ['default', 'vim', 'emacs']}}
+{{editors = ['default', 'vim', 'emacs', 'sublime']}}
 
 <form id="editor_settings_form" class="form-horizontal" action="">
 	<div class="control-group">
@@ -27,7 +27,7 @@
 	</div>
 	<div class="control-group">
 		<label class="control-label" for="tabwidth">{{=T('Tab width (# characters)')}}</label>
-		<div class="controls">{{=SELECT(range(1,9, 1), value=editor_settings['tabwidth'], _name="tabwidth" )}}</div>
+		<div class="controls">{{=SELECT(list(range(1,9, 1)), value=editor_settings['tabwidth'], _name="tabwidth" )}}</div>
 	</div>
 	<div class="control-group">
 		<label class="control-label" for="indentwithtabs">{{=T('Indent with tabs')}}</label>

applications/admin/views/default/plugin.html

@@ -24,7 +24,7 @@ def file_upload_form(location):
               INPUT(_type="hidden",_name="location",_value=location),
               INPUT(_type="hidden",_name="token",_value=session.token),
               INPUT(_type="hidden",_name="sender",_value=URL('design/'+app)),
-              INPUT(_type="submit",_value=T("submit")),_action=URL('upload_file'))
+              INPUT(_type="submit",_value=T("Submit")),_action=URL('upload_file'))
     return form
 def file_create_form(location):
     form=FORM(T("create file with filename:")," ",
@@ -32,7 +32,7 @@ def file_create_form(location):
               INPUT(_type="hidden",_name="location",_value=location),
               INPUT(_type="hidden",_name="token",_value=session.token),
               INPUT(_type="hidden",_name="sender",_value=URL('design/'+app)),
-              INPUT(_type="submit",_value=T("submit")),_action=URL('create_file'))
+              INPUT(_type="submit",_value=T("Submit")),_action=URL('create_file'))
     return form
 def deletefile(arglist):
 	return A(TAG[''](IMG(_src=URL('static', 'images/delete_icon.png')), 
@@ -85,7 +85,7 @@ def deletefile(arglist):
 				{{=peekfile('models',m)}}
 			</span>
 			<span class="extras">
-				{{if len(defines[m]):}}{{=T("defines tables")}} {{pass}}{{=XML(', '.join([B(table).xml() for table in defines[m]]))}}
+				{{if len(defines[m]):}}{{=T("defines tables")}} {{pass}}{{=XML(b', '.join([B(table).xml() for table in defines[m]]))}}
 			</span>
 		</li>
 		{{pass}}
@@ -118,7 +118,7 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 				{{=peekfile('controllers',c)}}
 			</span>
 			<span class="extras celled">
-				{{if functions[c]:}}{{=T("exposes")}} {{pass}}{{=XML(', '.join([A(f,_href=URL(a=app,c=c[:-3],f=f)).xml() for f in functions[c]]))}}
+				{{if functions[c]:}}{{=T("exposes")}} {{pass}}{{=XML(b', '.join([A(f,_href=URL(a=app,c=c[:-3],f=f)).xml() for f in functions[c]]))}}
 			</span>
 		</li>
 		{{pass}}
@@ -145,7 +145,7 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 			</span>
 			<span class="extras celled">
 				{{if c in extend:}}{{=T("extends")}} <b>{{=extend[c]}}</b> {{pass}}
-				{{if include[c]:}}{{=T("includes")}} {{pass}}{{=XML(', '.join([B(f).xml() for f in include[c]]))}}
+				{{if include[c]:}}{{=T("includes")}} {{pass}}{{=XML(b', '.join([B(f).xml() for f in include[c]]))}}
 			</span>
 		</li>
 		{{pass}}

applications/admin/views/default/site.html

@@ -46,7 +46,7 @@
       </td>
       <td>
         <div class="btn-group">
-          <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+          <a class="btn dropdown-toggle" data-toggle="dropdown">
         {{=T('Manage')}}
         <span class="caret"></span>
           </a>

applications/admin/views/generic.html

@@ -7,7 +7,7 @@ It is used as default when a view is not provided for your controllers
 """}}
 <h2>{{=' '.join(x.capitalize() for x in request.function.split('_'))}}</h2>
 {{if len(response._vars)==1:}}
-{{=BEAUTIFY(response._vars.values()[0])}}
+{{=BEAUTIFY(response._vars[next(iter(response._vars))])}}
 {{elif len(response._vars)>1:}}
 {{=BEAUTIFY(response._vars)}}
 {{pass}}

applications/admin/views/plugin_jqmobile/layout.html

@@ -34,7 +34,7 @@
     <link rel="stylesheet" href="{{=URL('static','plugin_jqmobile/jquery.mobile-1.3.1.min.css')}}">
 
     <!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
-    <script src="{{=URL('static','js/modernizr.custom.js')}}"></script!>
+    <script src="{{=URL('static','js/modernizr.custom.js')}}"></script>
 
     {{include 'web2py_ajax.html'}}
 

applications/examples/controllers/appadmin.py

@@ -12,11 +12,6 @@ import gluon.contenttype
 import gluon.fileutils
 from gluon._compat import iteritems
 
-try:
-    import pygraphviz as pgv
-except ImportError:
-    pgv = None
-
 is_gae = request.env.web2py_runtime_gae or False
 
 # ## critical --- make a copy of the environment
@@ -35,7 +30,7 @@ except:
 
 if request.is_https:
     session.secure()
-elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1") and \
+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'))
 
@@ -51,7 +46,7 @@ if request.function == 'manage':
                                       auth.table_permission()])
     manager_role = manager_action.get('role', None) if manager_action else None
     if not (gluon.fileutils.check_credentials(request) or auth.has_membership(manager_role)):
-        raise HTTP(403, "Not authorized")
+        raise HTTP(403, 'Not authorized')
     menu = False
 elif (request.application == 'admin' and not session.authorized) or \
         (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
@@ -187,12 +182,12 @@ def select():
     db = get_database(request)
     dbname = request.args[0]
     try:
-        is_imap = db._uri.startswith("imap://")
+        is_imap = db._uri.startswith('imap://')
     except (KeyError, AttributeError, TypeError):
         is_imap = False
-    regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
+    regex = re.compile(r'(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
     if len(request.args) > 1 and hasattr(db[request.args[1]], '_primarykey'):
-        regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
+        regex = re.compile(r'(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
     if request.vars.query:
         match = regex.match(request.vars.query)
         if match:
@@ -229,20 +224,20 @@ def select():
     session.last_orderby = orderby
     session.last_query = request.vars.query
     form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
-                _name='query', _value=request.vars.query or '',
+                _name='query', _value=request.vars.query or '', _class='form-control',
                 requires=IS_NOT_EMPTY(
-                    error_message=T("Cannot be empty")))), TR(T('Update:'),
+                    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 '', _class='form-control')), TR(T('Delete:'), INPUT(_name='delete_check',
                 _class='delete', _type='checkbox', value=False), ''),
-                TR('', '', INPUT(_type='submit', _value=T('submit')))),
+                TR('', '', INPUT(_type='submit', _value=T('Submit'), _class='btn btn-primary'))),
                 _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+)\..+')
+        regex = re.compile(request.args[0] + r'\.(?P<table>\w+)\..+')
         match = regex.match(form.vars.query.strip())
         if match:
             table = match.group('table')
@@ -259,8 +254,8 @@ def select():
 
             if is_imap:
                 fields = [db[table][name] for name in
-                    ("id", "uid", "created", "to",
+                    ('id', 'uid', 'created', 'to',
-                     "sender", "subject")]
+                     'sender', 'subject')]
             if orderby:
                 rows = db(query, ignore_common_filters=True).select(
                               *fields, limitby=(start, stop),
@@ -276,10 +271,10 @@ def select():
     # begin handle upload csv
     csv_table = table or request.vars.table
     if csv_table:
-        formcsv = FORM(str(T('or import from csv file')) + " ",
+        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')))
+                       INPUT(_type='submit', _value=T('import'), _class='btn btn-primary'))
     else:
         formcsv = None
     if formcsv and formcsv.process().accepted:
@@ -361,26 +356,26 @@ def state():
 def ccache():
     if is_gae:
         form = FORM(
-            P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")))
+            P(TAG.BUTTON(T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')))
     else:
         cache.ram.initialize()
         cache.disk.initialize()
 
         form = FORM(
             P(TAG.BUTTON(
-                T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+                T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')),
             P(TAG.BUTTON(
-                T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+                T('Clear RAM'), _type='submit', _name='ram', _value='ram')),
             P(TAG.BUTTON(
-                T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+                T('Clear DISK'), _type='submit', _name='disk', _value='disk')),
         )
 
     if form.accepts(request.vars, session):
-        session.flash = ""
+        session.flash = ''
         if is_gae:
             if request.vars.yes:
                 cache.ram.clear()
-                session.flash += T("Cache Cleared")
+                session.flash += T('Cache Cleared')
         else:
             clear_ram = False
             clear_disk = False
@@ -392,17 +387,16 @@ def ccache():
                 clear_disk = True
             if clear_ram:
                 cache.ram.clear()
-                session.flash += T("Ram Cleared")
+                session.flash += T('Ram Cleared')
             if clear_disk:
                 cache.disk.clear()
-                session.flash += T("Disk Cleared")
+                session.flash += T('Disk Cleared')
         redirect(URL(r=request))
 
     try:
-        from guppy import hpy
+        from pympler.asizeof import asizeof
-        hp = hpy()
     except ImportError:
-        hp = False
+        asizeof = False
 
     import shelve
     import os
@@ -442,7 +436,7 @@ def ccache():
             gae_stats['ratio'] = ((gae_stats['hits'] * 100) /
                 (gae_stats['hits'] + gae_stats['misses']))
         except ZeroDivisionError:
-            gae_stats['ratio'] = T("?")
+            gae_stats['ratio'] = T('?')
         gae_stats['oldest'] = GetInHMS(time.time() - gae_stats['oldest_item_age'])
         total.update(gae_stats)
     else:
@@ -456,9 +450,9 @@ def ccache():
             ram['ratio'] = 0
 
         for key, value in iteritems(cache.ram.storage):
-            if hp:
+            if asizeof:
-                ram['bytes'] += hp.iso(value[1]).size
+                ram['bytes'] += asizeof(value[1])
-                ram['objects'] += hp.iso(value[1]).count
+                ram['objects'] += 1
             ram['entries'] += 1
             if value[0] < ram['oldest']:
                 ram['oldest'] = value[0]
@@ -474,9 +468,9 @@ def ccache():
                 except (KeyError, ZeroDivisionError):
                     disk['ratio'] = 0
             else:
-                if hp:
+                if asizeof:
-                    disk['bytes'] += hp.iso(value[1]).size
+                    disk['bytes'] += asizeof(value[1])
-                    disk['objects'] += hp.iso(value[1]).count
+                    disk['objects'] += 1
                 disk['entries'] += 1
                 if value[0] < disk['oldest']:
                     disk['oldest'] = value[0]
@@ -508,7 +502,7 @@ def ccache():
             TR(TD(B(T('Key'))), TD(B(T('Time in Cache (h:m:s)')))),
             *[TR(TD(k[0]), TD('%02d:%02d:%02d' % k[1])) for k in keys],
             **dict(_class='cache-keys',
-                   _style="border-collapse: separate; border-spacing: .5em;"))
+                   _style='border-collapse: separate; border-spacing: .5em;'))
 
     if not is_gae:
         ram['keys'] = key_table(ram['keys'])
@@ -516,7 +510,7 @@ def ccache():
         total['keys'] = key_table(total['keys'])
 
     return dict(form=form, total=total,
-                ram=ram, disk=disk, object_stats=hp != False)
+                ram=ram, disk=disk, object_stats=asizeof != False)
 
 
 def table_template(table):
@@ -542,80 +536,29 @@ def table_template(table):
     # This is horribe HTML but the only one graphiz understands
     rows = []
     cellpadding = 4
-    color = "#000000"
+    color = '#000000'
-    bgcolor = "#FFFFFF"
+    bgcolor = '#FFFFFF'
-    face = "Helvetica"
+    face = 'Helvetica'
-    face_bold = "Helvetica Bold"
+    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)))
+                           _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,
+                              _align='left', _cellpadding=cellpadding,
                               _border=border),
                        TD(FONT(row.type, _color=color, _face=face),
-                               _align="left", _cellpadding=cellpadding,
+                               _align='left', _cellpadding=cellpadding,
                                _border=border),
                        TD(FONT(types(row), _color=color, _face=face),
-                               _align="center", _cellpadding=cellpadding,
+                               _align='center', _cellpadding=cellpadding,
                                _border=border)))
-    return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
+    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=request.application, color='#ECECEC')
-
-        group = meta_graphmodel['group'].replace(' ', '')
-        if group not in subgraphs:
-            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
-        subgraphs[group]['tables'].append(tablename)
-
-        graph.add_node(tablename, name=tablename, shape='plaintext',
-                       label=table_template(tablename))
-
-    for n, key in enumerate(subgraphs.iterkeys()):
-        graph.subgraph(nbunch=subgraphs[key]['tables'],
-                    name='cluster%d' % n,
-                    style='filled',
-                    color=subgraphs[key]['meta']['color'],
-                    label=subgraphs[key]['meta']['group'])
-
-    for tablename in db.tables:
-        for field in db[tablename]:
-            f_type = field.type
-            if isinstance(f_type,str) and (
-                f_type.startswith('reference') or
-                f_type.startswith('list:reference')):
-                referenced_table = f_type.split()[1].split('.')[0]
-                n1 = graph.get_node(tablename)
-                n2 = graph.get_node(referenced_table)
-                graph.add_edge(n1, n2, color="#4C4C4C", label='')
-
-    graph.layout()
-    if not request.args:
-        response.headers['Content-Type'] = 'image/png'
-        return graph.draw(format='png', prog='dot')
-    else:
-        response.headers['Content-Disposition']='attachment;filename=graph.%s'%request.args(0)
-        if request.args(0) == 'dot':
-            return graph.string()
-        else:
-            return graph.draw(format=request.args(0), prog='dot')
-
-def graph_model():
-    return dict(databases=databases, pgv=pgv)
-
 def manage():
     tables = manager_action['tables']
     if isinstance(tables[0], str):
@@ -645,7 +588,7 @@ def manage():
         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]
+            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():
@@ -661,13 +604,13 @@ def manage():
 def hooks():
     import functools
     import inspect
-    list_op=['_%s_%s' %(h,m) for h in ['before', 'after'] for m in ['insert','update','delete']]
+    list_op = ['_%s_%s' %(h,m) for h in ['before', 'after'] for m in ['insert','update','delete']]
-    tables=[]
+    tables = []
-    with_build_it=False
+    with_build_it = False
     for db_str in sorted(databases):
         db = databases[db_str]
         for t in db.tables:
-            method_hooks=[]
+            method_hooks = []
             for op in list_op:
                 functions = []
                 for f in getattr(db[t], op):
@@ -687,16 +630,64 @@ def hooks():
                         except:
                             pass
                 if len(functions):
-                    method_hooks.append({'name':op, 'functions':functions})
+                    method_hooks.append({'name': op, 'functions':functions})
             if len(method_hooks):
-                tables.append({'name':"%s.%s" % (db_str,t), 'slug': IS_SLUG()("%s.%s" % (db_str,t))[0], 'method_hooks':method_hooks})
+                tables.append({'name': '%s.%s' % (db_str, t), 'slug': IS_SLUG()('%s.%s' % (db_str,t))[0], 'method_hooks':method_hooks})
     # Render
     ul_main = UL(_class='nav nav-list')
     for t in tables:
         ul_main.append(A(t['name'], _onclick="collapse('a_%s')" % t['slug']))
-        ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
+        ul_t = UL(_class='nav nav-list', _id='a_%s' % t['slug'], _style='display:none')
         for op in t['method_hooks']:
-            ul_t.append(LI (op['name']))
+            ul_t.append(LI(op['name']))
-            ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
+            ul_t.append(UL([LI(A(f['funcname'], _class='editor_filelink', _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main
+
+
+# ##########################################################
+# d3 based model visualizations
+# ###########################################################
+
+def d3_graph_model():
+    ''' See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
+    and also the app_admin bg_graph_model function
+
+    Create a list of table dicts, called 'nodes'
+    '''
+
+    nodes = []
+    links = []
+
+    for database in databases:
+        db = eval_in_global_env(database)
+        for tablename in db.tables:
+            fields = []
+            for field in db[tablename]:
+                f_type = field.type
+                if not isinstance(f_type, str):
+                    disp = ' '
+                elif f_type == 'string':
+                    disp = field.length
+                elif f_type == 'id':
+                    disp = 'PK'
+                elif f_type.startswith('reference') or \
+                    f_type.startswith('list:reference'):
+                    disp = 'FK'
+                else:
+                    disp = ' '
+                fields.append(dict(name=field.name, type=field.type, disp=disp))
+
+                if isinstance(f_type, str) and (
+                    f_type.startswith('reference') or
+                    f_type.startswith('list:reference')):
+                    referenced_table = f_type.split()[1].split('.')[0]
+
+                    links.append(dict(source=tablename, target = referenced_table))
+
+            nodes.append(dict(name=tablename, type='table', fields = fields))
+
+    # d3 v4 allows individual modules to be specified.  The complete d3 library is included below.
+    response.files.append(URL('admin','static','js/d3.min.js'))
+    response.files.append(URL('admin','static','js/d3_graph.js'))
+    return dict(databases=databases, nodes=nodes, links=links)

applications/examples/controllers/soap_examples.py

@@ -25,6 +25,9 @@ def division(a, b):
     "Divide two values "
     return a / b
 
+@service.soap('DummyCustomElement', returns={'out0': str}, args={'in0': str}, response_element_name='customResponseTag')
+def dummy(in0):
+    return in0
 
 # expose the soap methods
 
@@ -51,3 +54,20 @@ def test_soap_sub():
                 xml_response=client.xml_response,
                 result=result)
 
+def test_custom_response_element_name():
+    from gluon.contrib.pysimplesoap.client import SoapClient, SoapFault
+    # build the url to the WSDL (web service description)
+    # like "http://localhost:8000/webservices/sample/call/soap?WSDL"
+    url = URL(f="call/soap", vars={"WSDL": ""}, scheme=True)
+    # create a SOAP client
+    client = SoapClient(wsdl=url)
+    # call the SOAP remote method
+    try:
+        ret = client.DummyCustomElement(in0="Hello World!")
+        result = ret['out0']
+    except SoapFault as sf:
+        result = sf
+    response.view = "soap_examples/generic.html"
+    return dict(xml_request=client.xml_request, 
+                xml_response=client.xml_response,
+                result=result)

applications/examples/private/content/en/default/documentation/community.markmin

@@ -1,8 +1,6 @@
 ### Community Documentation
 
 - [[Roadmap https://trello.com/b/d3aqBbBl/web2py-roadmap]]
-- [[web2pybrasil http://www.web2pybrasil.com.br popup]]
-- Apostila em português [[Download http://dl.dropbox.com/u/830444/apostila_web2py_basico.pdf popup]] e [[Online http://web2pybrasil.appspot.com/init/plugin_wiki/page/curso-web2py-000 popup]]
 - [[Sitio en español http://www.web2py.com.ar popup]]
 - [[Documentación en español http://www.web2py.com.ar/examples/default/docs popup]]
-- [[Chrome extension to display tickets https://github.com/agarden/web2py-devmode-chrome]]
+- [[Chrome extension to display tickets https://github.com/agarden/web2py-devmode-chrome]]

applications/examples/private/content/en/default/documentation/more.markmin

@@ -10,11 +10,8 @@
 - [[Intro video http://www.youtube.com/watch?v=BXzqmHx6edY]] and [[code examples https://github.com/mjhea0/web2py]]
 - [[Step by step tutorial https://milesm.pythonanywhere.com/wiki]]
 - [[web2py Reference Project http://www.web2pyref.com/]]
-- [[An advanced tutorial https://milesm.pythonanywhere.com/wiki]]
 - [[Killer Web Development Tutorial http://killer-web-development.com/]]
 - [[Real Python for the Web http://www.realpython.com]] (web development with web2py and more!)
-- [[Admin Demo http://www.web2py.com/demo_admin popup]] (web-based IDE)
-- [[Welcome App Demo http://www.web2py.com/welcome]] (scaffolding application)
 - [[Videos http://www.web2py.com/examples/default/videos/]]
 - [[FAQ http://www.web2py.com/AlterEgo popup]]
 

applications/examples/private/content/en/default/documentation/official.markmin

@@ -1,10 +1,10 @@
 ### Official Documentation
 
 - [[**web2py Online Book (english)** http://web2py.com/book popup]]
-- [[web2py Online Book (spanish) http://www.latinuxpress.com/books/drafts/web2py/ popup]]
+- [[web2py Online Book (translations in several languages) http://www.web2py.com/books/default/index popup]]
 - [[Buy E-book/Printed Version http://stores.lulu.com/web2py popup]]
 - [[web2py Application Development Cookbook http://www.packtpub.com/web2py-application-development-recipes-to-master-python-web-framework-cookbook/book?utm_source=web2py.com&utm_medium=link&utm_content=pod&utm_campaign=mdb_009617]]
 - [[Quick Examples http://www.web2py.com/examples/default/examples]]
 - [[API http://web2py.com/book/default/chapter/04#API popup]]
 - [[Sphinx (source code documentation) http://web2py.readthedocs.org/en/latest/ popup]]
-- [[Videos https://vimeo.com/album/3016728]] (edited by Nico Zanferrari)
+- [[Videos https://vimeo.com/album/3016728]] (edited by Nico Zanferrari)

applications/examples/private/content/en/default/usergroups/grouplist.markmin

@@ -44,9 +44,3 @@ Spanish speakers group
 
 ``web2py-usuarios``:groupdates
 
-## Chinese Group
-
-Chinese speakers group
-
-- [[http://web2py.sinaapp.com/ popup]]
-

applications/examples/private/content/en/default/what/whyweb2py.markmin

@@ -3,9 +3,9 @@
 - **Created by a community of professionals** and University professors in Computer Science and Software Engineering.
 - **Always backward compatible.** We have not broken backward compatibility since version 1.0 in 2007, and we pledge not to break it in the future.
 - **Easy to run.** It requires no installation and no configuration.
-- **Runs on** Windows, Mac, Unix/Linux, Google App Engine, Amazon EC2, and almost any web hosting via Python 2.5/2.6/2.7/pypy, or Java with Jython.
+- **Runs on** Windows, Mac, Unix/Linux, Google App Engine, Amazon EC2, and almost any web hosting via Python 2.7/3.5/3.6/pypy.
-- **Runs with** Apache, Lighttpd, Cherokee and almost any other web server via CGI, FastCGI, WSGI, mod_proxy, and/or mod_python. It can embed third party WSGI apps and middleware.
+- **Runs with** Apache, Nginx, Lighttpd, Cherokee and almost any other web server via CGI, FastCGI, WSGI, mod_proxy, and/or mod_python. It can embed third party WSGI apps and middleware.
-- **Talks to** SQLite, PostgreSQL, MySQL, MSSQL, FireBird, Oracle, IBM DB2, Informix, Ingres, and Google App Engine. 
+- **Talks to** SQLite, PostgreSQL, MySQL, MSSQL, FireBird, Sybase, Oracle, IBM DB2, Informix, Ingres, MongoDB, and Google App Engine. 
 - **Secure** [[It prevents the most common types of vulnerabilities http://web2py.com/examples/default/security]] including Cross Site Scripting, Injection Flaws, and Malicious File Execution.
 - **Enforces good Software Engineering practices** (Model-View-Controller design, Server-side form validation, postbacks) that make the code more readable, scalable, and maintainable.
 - **Speaks multiple protocols** HTML/XML, RSS/ATOM, RTF, PDF, JSON, AJAX, XML-RPC, CSV, REST, WIKI, Flash/AMF, and Linked Data (RDF). 

applications/examples/static/js/web2py.js

@@ -12,6 +12,10 @@
         $.error('web2py.js has already been loaded!');
     }
 
+    var FORMDATA_IS_SUPPORTED = typeof(FormData) !== 'undefined';
+    var animateIn = 'fadeIn';
+    // var animateIn = 'slideDown';
+
     String.prototype.reverse = function () {
         return this.split('').reverse().join('');
     };
@@ -38,8 +42,12 @@
             if (value > 0) $('#' + id).hide().fadeIn('slow');
             else $('#' + id).show().fadeOut('slow');
         },
-        ajax: function (u, s, t) {
+        ajax: function (u, s, t, options) {
             /*simple ajax function*/
+
+            // set options default value
+            options = typeof options !== 'undefined' ? options : {};
+
             var query = '';
             if (typeof s == 'string') {
                 var d = $(s).serialize();
@@ -59,18 +67,44 @@
                     query = pcs.join('&');
                 }
             }
-            $.ajax({
+
+            // default success action
+            var success_function = function (msg) {
+                if (t) {
+                    if (t == ':eval') eval(msg);
+                    else if (typeof t == 'string') $('#' + t).html(msg);
+                    else t(msg);
+                }
+            };
+
+            // declare success actions as array
+            var success = [success_function];
+
+            // add user success actions
+            if ($.isArray(options.done)){
+                success = $.merge(success, options.done);
+            } else {
+                success.push(options.done);
+            }
+
+            // default jquery ajax options
+            var ajax_options = {
                 type: 'POST',
                 url: u,
                 data: query,
-                success: function (msg) {
+                success: success
-                    if (t) {
+            };
-                        if (t == ':eval') eval(msg);
+
-                        else if (typeof t == 'string') $('#' + t).html(msg);
+            //remove custom "done" option if exists
-                        else t(msg);
+            delete options.done;
-                    }
+
-                }
+            // merge default ajax options with user custom options
-            });
+            for (var attrname in options) {
+                    ajax_options[attrname] = options[attrname];
+            }
+
+            // call ajax function
+            $.ajax(ajax_options);
         },
         ajax_fields: function (target) {
             /*
@@ -148,7 +182,7 @@
         },
         /* manage errors in forms */
         manage_errors: function (target) {
-            $('div.error', target).hide().slideDown('slow');
+            $('div.error', target).hide()[animateIn]('slow');
         },
         after_ajax: function (xhr) {
             /* called whenever an ajax request completes */
@@ -233,13 +267,17 @@
                 }
             });
             /* help preventing double form submission for normal form (not LOADed) */
-            $(doc).on('submit', 'form', function () {
+            $(doc).on('submit', 'form', function (e) {
-                var submit_button = $(this).find(web2py.formInputClickSelector);
+                var submit_buttons = $(this).find(web2py.formInputClickSelector);
-                web2py.disableElement(submit_button);
+                submit_buttons.each(function() {
+                    web2py.disableElement($(this));
+                })
                 /* safeguard in case the form doesn't trigger a refresh,
                 see https://github.com/web2py/web2py/issues/1100 */
                 setTimeout(function () {
-                    web2py.enableElement(submit_button);
+                    submit_buttons.each(function() {
+                        web2py.enableElement($(this));
+                    });
                 }, 5000);
             });
             doc.ajaxSuccess(function (e, xhr) {
@@ -290,7 +328,15 @@
                 form.submit(function (e) {
                     web2py.disableElement(form.find(web2py.formInputClickSelector));
                     web2py.hide_flash();
-                    web2py.ajax_page('post', url, form.serialize(), target, form);
+
+                    var formData;
+                    if (FORMDATA_IS_SUPPORTED) {
+                        formData = new FormData(form[0]); // Allows file uploads.
+                    } else {
+                        formData = form.serialize(); // Fallback for older browsers.
+                    }
+                    web2py.ajax_page('post', url, formData, target, form);
+
                     e.preventDefault();
                 });
                 form.on('click', web2py.formInputClickSelector, function (e) {
@@ -309,11 +355,18 @@
             if (web2py.isUndefined(element)) element = $(document);
             /* if target is not there, fill it with something that there isn't in the page*/
             if (web2py.isUndefined(target) || target === '') target = 'w2p_none';
+
+            /* processData and contentType must be set to false when passing a FormData
+               object to jQuery.ajax. */
+            var isFormData = Object.prototype.toString.call(data) === '[object FormData]';
+            var contentType = isFormData ? false : 'application/x-www-form-urlencoded; charset=UTF-8';
             if (web2py.fire(element, 'ajax:before', null, target)) { /*test a usecase, should stop here if returns false */
                 $.ajax({
                     'type': method,
                     'url': action,
                     'data': data,
+                    'processData': !isFormData,
+                    'contentType': contentType,
                     'beforeSend': function (xhr, settings) {
                         xhr.setRequestHeader('web2py-component-location', document.location);
                         xhr.setRequestHeader('web2py-component-element', target);
@@ -564,8 +617,8 @@
         flash: function (message, status) {
             var flash = $('.w2p_flash');
             web2py.hide_flash();
-            flash.html(message).addClass(status);
+            flash.text(message).addClass(status);
-            if (flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown();
+            if (flash.html()) flash.append('<span id="closeflash"> &times; </span>')[animateIn]();
         },
         hide_flash: function () {
             $('.w2p_flash').fadeOut(0).html('');
@@ -579,7 +632,7 @@
                 for (var k = 0; k < triggers[id].length; k++) {
                     var dep = $('#' + triggers[id][k], target);
                     var tr = $('#' + triggers[id][k] + '__row', target);
-                    if (t.is(dep.attr('data-show-if'))) tr.slideDown();
+                    if (t.is(dep.attr('data-show-if'))) tr[animateIn]();
                     else tr.hide();
                 }
             };
@@ -669,8 +722,9 @@
             });
         },
         /* Disables form elements:
+        - Does not disable elements with 'data-w2p_disable' attribute
         - Caches element value in 'w2p_enable_with' data store
-        - Replaces element text with value of 'data-disable-with' attribute
+        - Replaces element text with value of 'data-w2p_disable_with' attribute
         - Sets disabled property to true
         */
         disableFormElements: function (form) {
@@ -682,13 +736,15 @@
                 if (!web2py.isUndefined(disable)) {
                     return false;
                 }
-                if (web2py.isUndefined(disable_with)) {
+                if (!element.is(':file')) { // Altering file input values is not allowed.
-                    element.data('w2p_disable_with', element[method]());
+                    if (web2py.isUndefined(disable_with)) {
+                        element.data('w2p_disable_with', element[method]());
+                    }
+                    if (web2py.isUndefined(element.data('w2p_enable_with'))) {
+                        element.data('w2p_enable_with', element[method]());
+                    }
+                    element[method](element.data('w2p_disable_with'));
                 }
-                if (web2py.isUndefined(element.data('w2p_enable_with'))) {
-                    element.data('w2p_enable_with', element[method]());
-                }
-                element[method](element.data('w2p_disable_with'));
                 element.prop('disabled', true);
             });
         },
@@ -769,4 +825,4 @@ web2py_event_handlers = jQuery.web2py.event_handlers;
 web2py_trap_link = jQuery.web2py.trap_link;
 web2py_calc_entropy = jQuery.web2py.calc_entropy;
 */
-/* compatibility code - end*/
+/* compatibility code - end*/

applications/examples/views/appadmin.html

@@ -9,16 +9,19 @@
 });
 //--></script>
 
+<div class="row">
+  <div class="col-md-12">
+
 {{if request.function=='index':}}
 <h2>{{=T("Available Databases and Tables")}}</h2>
   {{if not databases:}}{{=T("No databases in this application")}}{{pass}}
   <ul class="nav nav-tabs" id="myTab">
-  <li class="active" ><a href="#alltables" data-toggle="tab">Tables</a></li>
+    <li class="nav-item"><a href="#alltables" data-toggle="tab" class="nav-link active">Tables</a></li>
-  <li><a href="#hooks" data-toggle="tab">Hooks</a></li>
+    <li class="nav-item"><a href="#hooks" data-toggle="tab" class="nav-link">Hooks</a></li>
   </ul>
   <div class="tab-content">
       <div class="tab-pane active" id="alltables">
-        <table class="table">
+        <table class="table table-striped">
           {{for db in sorted(databases):}}
             {{for table in databases[db].tables:}}
               {{qry='%s.%s.id>0'%(db,table)}}
@@ -37,10 +40,10 @@
               {{pass}}
           <tr>
             <th style="font-size: 1.75em;">
-              {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
+              &raquo; {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
             </th>
             <td>
-              {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn btn-default")}}
+              {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn btn-primary")}}
             </td>
           </tr>
           {{pass}}
@@ -61,28 +64,31 @@
   </pre>
   {{pass}}
   {{if table:}}
-  {{=A(str(T('New Record')),_href=URL('insert',args=[request.args[0],table]),_class="btn btn-default")}}<br/><br/>
+  {{=A(str(T('New Record')),_href=URL('insert',args=[request.args[0],table]),_class="btn btn-primary", _role="button")}}<br/><br/>
+  <hr />
     <h3>{{=T("Rows in Table")}}</h3><br/>
    {{else:}}
     <h3>{{=T("Rows selected")}}</h3><br/>
    {{pass}}
    {{=form}}
-   <p>{{=T('The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.')}}<br/>
+   <p class="text-muted">{{=T('The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.')}}<br/>
       {{=T('Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.')}}<br/>
       {{=T('"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN')}}</p>
     <br/><br/>
     <h4>{{=T("%s selected", nrows)}}</h4>
-    {{if start>0:}}{{=A(T('previous %s rows') % step,_href=URL('select',args=request.args[0],vars=dict(start=start-step)),_class="btn btn-default")}}{{pass}}
+    {{if start>0:}}{{=A(T('previous %s rows') % step,_href=URL('select',args=request.args[0],vars=dict(start=start-step)),_class="btn btn-primary")}}{{pass}}
-    {{if stop<nrows:}}{{=A(T('next %s rows') % step,_href=URL('select',args=request.args[0],vars=dict(start=start+step)),_class="btn btn-default")}}{{pass}}
+    {{if stop<nrows:}}{{=A(T('next %s rows') % step,_href=URL('select',args=request.args[0],vars=dict(start=start+step)),_class="btn btn-primary")}}{{pass}}
     {{if rows:}}
        <div style="overflow:auto; width:80%;">
        {{linkto = lambda f, t, r: URL('update', args=[request.args[0], r, f]) if f else "#"}}
        {{upload=URL('download',args=request.args[0])}}
-       {{=SQLTABLE(rows,linkto,upload,orderby=True,_class='sortable')}}
+       {{=SQLTABLE(rows,linkto,upload,orderby=True,_class='table table-striped table-bordered sortable')}}
        </div>
     {{pass}}
-    <br/><br/><h3>{{=T("Import/Export")}}</h3><br/>
+    <br/><br/>
-    <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn btn-default">{{=T("export as csv file")}}</a>
+    <hr />
+    <h3>{{=T("Import/Export")}}</h3><br/>
+    <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn btn-primary">{{=T("export as csv file")}}</a>
   {{=formcsv or ''}}
 
 {{elif request.function=='insert':}}
@@ -148,7 +154,7 @@
           {{=T.M("(**%.0d MB**)", total['bytes'] / 1048576)}}
         {{pass}}
       {{else:}}
-        {{=T.M("**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)")}}
+        {{=T.M("**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)")}}
       {{pass}}
     </p>
     <p>
@@ -176,7 +182,7 @@
           {{=T.M("(**%.0d MB**)", ram['bytes'] / 10485576)}}
         {{pass}}
       {{else:}}
-        {{=T.M("``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)")}}
+        {{=T.M("``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)")}}
       {{pass}}
     </p>
     <p>
@@ -205,7 +211,7 @@
           {{=T.M("(**%.0d MB**)", disk['bytes'] / 1048576)}}
         {{pass}}
       {{else:}}
-        {{=T.M("``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)")}}
+        {{=T.M("``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)")}}
       {{pass}}
       </p>
       <p>
@@ -233,30 +239,22 @@
 <div class="clear"></div>
 {{pass}}
 
-{{if request.function=='graph_model':}}
+{{if request.function=='d3_graph_model':}}
 <h2>{{=T("Graph Model")}}</h2>
-  {{if not pgv:}}
+  {{if not databases:}}  
-    {{=T('pygraphviz library not found')}}
-  {{elif not databases:}}
     {{=T("No databases in this application")}}
-  {{else:}}	   
+  {{else:}}    
-    <div class="btn-group">
+    <div id="vis"></div>
-      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+      <link rel="stylesheet" href="{{=URL('admin','static','css/d3_graph.css')}}"/>
-        <i class="icon-download"></i> {{=T('Save model as...')}}
+      <script>
-        <span class="caret"></span>
+        // Define the d3 input data
-      </a>
+        {{from gluon.serializers import json }}
-      <ul class="dropdown-menu">
+        var nodes = {{=XML(json(nodes))}};
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['png'])}}">png</a></li>
+        var links = {{=XML(json(links))}};
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['svg'])}}">svg</a></li>
+        d3_graph();
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['pdf'])}}">pdf</a></li>
+      </script>
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['ps'])}}">ps</a></li>
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['dot'])}}">dot</a></li>
-      </ul>
-    </div>
-    <br />
-    {{=IMG(_src=URL('appadmin', 'bg_graph_model'))}}
   {{pass}}
-{{pass}}
+{{pass}}  
 
 {{if request.function == 'manage':}}
 <h2>{{=heading}}</h2>
@@ -276,3 +274,6 @@
   {{pass}}
 </div>
 {{pass}}
+
+  </div>
+</div>

applications/examples/views/default/documentation.html

@@ -3,7 +3,7 @@
 <div>
   {{=get_content('main')}}
   <center>
-    <iframe src="//player.vimeo.com/hubnut/album/3016728?color=ff6600&amp;background=ffffff&amp;slideshow=1&amp;video_title=1&amp;video_byline=1" width="400" height="300" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
+    <iframe src="https://player.vimeo.com/video/104800778?color=ff6600&amp;background=ffffff&amp;slideshow=1&amp;video_title=1&amp;video_byline=1" width="400" height="300" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
   </center>
   {{=get_content('official')}}
   {{=get_content('community')}}

applications/examples/views/default/download.html

@@ -9,7 +9,8 @@
   <table class="twothirds">
     <thead>
       <tr>
-        <th>For Normal Users</th>
+        <th>For Normal Users (Py3)</th>
+        <th>For Legacy Users (Py2)</th>
         <th>For Testers</th>
         <th>For Developers</th>
       </tr>
@@ -17,10 +18,13 @@
     <tbody>
       <tr>
         <td>
-          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_win.zip">For Windows</a>
+          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_win.zip">Windows binaries</a>
         </td>
         <td>
-          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_win.zip">For Windows</a>
+          <a class="btn btn180 rounded" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_win_py2.zip">Windows binaries</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_win.zip">Windows binaries</a>
         </td>
         <td>
           <a class="btn btn180 rounded red" href="http://github.com/web2py/web2py/">Git Repository</a>
@@ -28,17 +32,25 @@
       </tr>
       <tr>
         <td>
-          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_osx.zip">For Mac</a>
+          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_osx.zip">Mac binaries</a>
         </td>
         <td>
-          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_osx.zip">For Mac</a>
+          <a class="btn btn180 rounded" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_osx_py2.zip">Mac binaries</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_osx.zip">Mac binaries</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded" href="http://mdipierro.github.io/web2py/web2py_manual_5th.pdf">Manual</a>
         </td>
-        <td></td>
       </tr>
       <tr>
         <td>
           <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_src.zip">Source Code</a>
         </td>
+        <td>
+          <a class="btn btn180 rounded" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_src.zip">Source Code</a>
+        </td>
         <td>
           <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_src.zip">Source Code</a>
         </td>
@@ -48,7 +60,8 @@
       </tr>
       <tr>
         <td>
-          <a class="btn btn180 rounded green" href="https://dl.dropbox.com/u/18065445/web2py/web2py_manual_5th.pdf">Manual</a>
+        </td>
+        <td>
         </td>
         <td>
           <a class="btn btn180 rounded" href="https://github.com/web2py/web2py/releases">Change Log</a>
@@ -62,16 +75,22 @@
 </center>
 
 <p style="text-align:left;">
-  The source code version works on all supported platforms, including Linux, but it requires Python 2.6, or 2.7 (recommended).
+  The source code version works on Windows and most Unix systems, including <b>Linux</b>,  <b>BSD</b> and  <b>Mac</b> . It requires Python 3.5+ (recommended for new projects) 
-  It runs on Windows and most Unix systems, including <b>Linux</b> and <b>BSD</b>.
+  or Python 2.7+ (stable, for use with legacy apps) already installed on your system.
+</p>
+<p style="text-align:left;">
+  There are also binary packages for Windows and MacOs. They include the Python interpreter version 3.7.4 or 2.7.16, so you do not need to have it pre-installed.
 </p>
 
 <h3>Instructions</h3>
-<p>After download, unzip it and click on web2py.exe (windows) or web2py.app (osx).
+<p>With the binary packages, after download, just unzip it and then click on web2py.exe (Windows) or web2py (MacOs).</p>
-  To run from source, type:</p>
+<p>Note that on recent MacOs versions (10.12+) you could face problems in running the binary App program, due to the last changes to the security settings. 
-{{=CODE("python2.7 web2py.py", language=None, counter='>', _class='boxCode')}}
+In this case, press the 'control' key + click on downloaded file and then 'open' it (confirm the warnings). Finally move the program in Applications and run it from there.
+</p>
+<p> If you prefer to run it from source with your own Python interpreter already installed, type:</p>
+{{=CODE("python web2py.py", language=None, counter='>', _class='boxCode')}}
 <p>or for more info type:</p>
-{{=CODE("python2.7 web2py.py -h", language=None, counter='>', _class='boxCode')}}
+{{=CODE("python web2py.py -h", language=None, counter='>', _class='boxCode')}}
 
 
 <h3>Caveats</h3>
@@ -81,7 +100,7 @@
 
 <h3 id="license">License</h3>
 <p>Web2py code is released under <a href="http://www.gnu.org/licenses/lgpl.html">LGPLv3 License</a>. This license does not extend to third party libraries distributed with web2py (which can be MIT, BSD or Apache type licenses) nor does it extend to applications built with web2py (under the terms of the LGPL.</p>
-<p>Applications built with web2py can be released under any license the author wishes as long they do not contain web2py code. They can link unmodified web2py libraries and they can be distributed with official web2py binaries. In particular web2py applications can be distributed in closed source. The admin interface provides a button to byte-code compile.</p>
+<p>Applications built with web2py can be released under any license the author wishes as long as they do not contain web2py code. They can link unmodified web2py libraries and they can be distributed with official web2py binaries. In particular web2py applications can be distributed in closed source. The admin interface provides a button to byte-code compile.</p>
 <p>It is fine to distribute web2py (source or compiled) with your applications as long as you make it clear in the license where your application ends and web2py starts.</p>
 <p>web2py is copyrighted by Massimo Di Pierro. The web2py trademark is owned by Massimo Di Pierro.</p>
 <a class="btn btn-small rounded" href="{{=URL('license')}}">read more</a>

applications/examples/views/default/examples.html

@@ -50,10 +50,10 @@ def hello3():
 
     <b>and view: simple_examples/hello3.html</b>
     {{=CODE(open(os.path.join(request.folder,'views/simple_examples/hello3.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
-    <p>If you return a dictionary, the variables defined in the dictionery are visible to the view (template).
+    <p>If you return a dictionary, the variables defined in the dictionary are visible to the view (template).
     <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/hello3.html">hello3</a></p>
 
-    <p>Actions can also be be rendered in other formsts like JSON, <a href="/{{=request.application}}/simple_examples/hello3.json">hello3.json</a>, and XML, <a href="/{{=request.application}}/simple_examples/hello3.xml">hello3.xml</a></p>
+    <p>Actions can also be be rendered in other formats like JSON, <a href="/{{=request.application}}/simple_examples/hello3.json">hello3.json</a>, and XML, <a href="/{{=request.application}}/simple_examples/hello3.xml">hello3.xml</a></p>
 
     <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
     {{=CODE("""
@@ -69,7 +69,7 @@ def hello4():
 def hello5():
     return HTML(BODY(H1(T('Hello World'),_style="color: red;"))).xml() # .xml to serialize
     """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
-    <p>You can also generate HTML using helper objects HTML, BODY, H1, etc. Each of these tags is a class and the views know how to render the corresponding objects. The method .xml() serializes them and produce html/xml code for the page.
+    <p>You can also generate HTML using helper objects HTML, BODY, H1, etc. Each of these tags is a class and the views know how to render the corresponding objects. The method .xml() serializes them and produces html/xml code for the page.
     Each tag, DIV for example, takes three types of arguments:</p>
     <ul>
     <li>unnamed arguments, they correspond to nested tags</li>
@@ -201,11 +201,11 @@ def ajaxwiki_onclick():
     <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: session_examples.py </b>
     {{=CODE("""
 def counter():
-    session.counter = (sesstion.counter or 0) + 1
+    session.counter = (session.counter or 0) + 1
     return dict(counter=session.counter)
     """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: session_examples/counter.html</b>
     {{=CODE(open(os.path.join(request.folder,'views/session_examples/counter.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
-    <p>Click to count. The session.counter is persistent for this user and application. Every applicaiton within the system has its own separate session management.
+    <p>Click to count. The session.counter is persistent for this user and application. Every application within the system has its own separate session management.
     <br/>Try it here: <a class="btn" href="/{{=request.application}}/session_examples/counter">counter</a></p>
 
     <h2 id="template_examples">Template Examples</h2>
@@ -390,7 +390,7 @@ db.purchase.quantity.requires = IS_INT_IN_RANGE(0, 10)
     """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
     <p>
     Tables are created if they do not exist (try... except).
-    Here "purchased" is an Query object, "db(purchased)" would be a Set objects. A Set object can be selected, updated, deleted. Sets can also be intersected. Allowed field types are string, integer, password, text, blob, upload, date, time, datetime, references(*), and id(*). The id field is there by default and must not be declared. references are for one to many and many to many as in the example above. For strings you should specify a length or you get length=32.<br/><br/>
+    Here "purchased" is an Query object, "db(purchased)" would be a Set objects. A Set object can be selected, updated, deleted. Sets can also be intersected. Allowed field types are string, integer, password, text, blob, upload, date, time, datetime, references(*), and id(*). The id field is there by default and must not be declared. References are for one to many and many to many as in the example above. For strings you should specify a length or you get length=32.<br/><br/>
     You can use db.tablename.fieldname.requires= to set restrictions on the field values. These restrictions are automatically converted into widgets when generating forms from the table with SQLFORM(db.tablename).
     <br/><br/>
     define_tables creates the table and attempts a migration if table has changed or if database name has changed since last time. If you know you already have the table in the database and you do not want to attempt a migration add one last argument to define_table <tt>migrate=False</tt>.</p>
@@ -443,7 +443,7 @@ def buy():
         Field('product_id',requires=IS_IN_DB(db,db.product.id,'%(name)s')),
         Field('quantity','integer',requires=IS_INT_IN_RANGE(1,100))).process()
     if form.accepted:
-        # get previous purchese for same product
+        # get previous purchase for same product
         purchase = db((db.purchase.buyer_id == form.vars.buyer_id)&
             (db.purchase.product_id==form.vars.product_id)).select().first()
 
@@ -551,7 +551,7 @@ def cache_controller_and_view():
     d=dict(time=t,link=A('click to reload',_href=URL(r=request)))
     return response.render(d)
     """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
-    <p><tt>response.render(d)</tt> renders the dictionary inside the controller, so everything is cached now for 5 seconds. This is best and fastest way of caching!
+    <p><tt>response.render(d)</tt> renders the dictionary inside the controller, so everything is cached now for 5 seconds. This is the best and fastest way of caching!
     <br/>Try it here: <a class="btn" href="/{{=request.application}}/cache_examples/cache_controller_and_view">cache_controller_and_view</a></p>
 
     <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: cache_examples.py </b>
@@ -633,14 +633,14 @@ def streamer():
     path=os.path.join(request.folder,'private','largefile.mpeg4')
     return response.stream(open(path,'rb'),chunk_size=4096)
 """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
-    <p>By default all static files and files stored in 'upload' fields in the database are streamed when larger than 1MByte.</p>
+    <p>By default all static files and files stored in 'upload' fields in the database are streamed when larger than 1 MByte.</p>
 
     </p>web2py automatically and transparently handles PARTIAL_CONTENT and RANGE requests.</p>
 
     <h2 id="xmlrpc_examples">XML-RPC Examples</h2>
 
     <h3>Example {{=c}}{{c+=1}}</h3>
-    <p>Web2py has native support for the XMLRPC protocol. Below is a controller function "handler" that exposes two functions, "add" and "sub" via XMLRPC. The controller "tester" executes the two function remotely via xmlrpc.</p>
+    <p>Web2py has native support for the XMLRPC protocol. Below is a controller function "handler" that exposes two functions, "add" and "sub" via XMLRPC. The controller "tester" executes the two functions remotely via xmlrpc.</p>
     {{=CODE("""
 from gluon.tools import Service
 service = Service(globals())

applications/examples/views/default/index.html

@@ -4,7 +4,7 @@
   <div class="twothirds">
     <div class="padded">
       <h3><img src="{{=URL('static/images', 'web2py_logo.png')}}"> Web Framework</h3>
-      <p>Free open source full-stack framework for rapid development of fast, scalable, <a href="http://www.web2py.com/book/default/chapter/01#Security" target="_blank">secure</a> and portable database-driven web-based applications. Written and programmable in <a href="http://www.python.org" target="_blank">Python</a>.</p>
+      <p>Free open source full-stack framework for rapid development of fast, scalable, <a href="http://www.web2py.com/book/default/chapter/01#Security" target="_blank">secure</a> and portable database-driven web-based applications. Written and programmable in <a href="http://www.python.org" target="_blank">Python</a> (version 3 and 2.7).</p>
       <table width="100%">
 	<tr>
 	  <td>
@@ -18,7 +18,7 @@
 	    </a>
 	  </td>
 	  <td>
-	    <a class="noeffect" href="http://link.packtpub.com/SUlnrN">
+	    <a class="noeffect" href="https://www.packtpub.com/web-development/web2py-application-development-cookbook">
 	      <img src="{{=URL('static','images/book-recipes.png')}}" />
 	    </a>
 	  </td>

applications/examples/views/default/support.html

@@ -15,14 +15,13 @@
   <p>For professional support, you can also contact one of the companies below:</p>
 
     <ul>
-      <li><a target="_blank" href="http://experts4solutions.com">Experts4Soutions</a> (worldwide)</li>
+      <li><a target="_blank" href="http://experts4solutions.com">Experts4Solutions</a> (worldwide)</li>
       <li><a target="_blank" href="http://www.planethost.com">PlanetHost</a> (USA)</li>
       <li><a target="_blank" href="http://www.corebyte.nl">Corebyte</a> (Netherlands)</li>
       <li><a target="_blank" href="http://www.dutveul.nl">Dutveul</a> (Netherlands)</li>
       <li><a target="_blank" href="http://www.onemewebservices.com">OneMeWebServices</a> (Canada)</li>
       <li><a target="_blank" href="http://www.budgetbytes.nl">BudgetBytes</a> (The Netherlands)</li>
       <li><a target="_blank" href="http://www.androsoft.pl">ANDROSoft</a> (Poland)</li>
-      <li><a target="_blank" href="http://www.sonnetech.com.br">Sonne Tech</a> (Brazil)</li>
       <li><a target="_blank" href="http://www.nrg.com.br">NRG Internet Solutions</a> (Brazil)</li>
       <li><a target="_blank" href="http://itjp.net.br/">ITJP</a> (Brazil)</li>
       <li><a target="_blank" href="http://i-am.pt">I am Consultoria</a> (Portugal)</li>
@@ -33,7 +32,6 @@
       <li><a target="_blank" href="http://www.appliedobjects.com">Applied Objects</a> (New Zealand)</li>
       <li><a target="_blank" href="http://www.sistemasagiles.com.ar/">Sistemas Ágiles</a> ("Agile Systems") (Argentina)</li>
       <li><a target="_blank" href="http://www.tasko.it/">Tasko</a> (Italy)</li>
-      <li><a target="_blank" href="http://www.geekondemand.it/"> GeekOnDemand</a> (Italy)</li>
       <li><a target="_blank" href="http://stifix.com"> Stifix</a> (Indonesia)</li>
       <li><a target="_blank" href="http://www.garciac.es"> Garciac</a> (Spain)</li>
       <li><a target="_blank" href="http://memoriapersistente.pt "> Memoria persistente</a> (Portugal)</li>

applications/examples/views/default/who.html

@@ -111,6 +111,7 @@
 </li><li>Ovidio Marinho Falcao Neto (tests and plugin developer)
 </li><li>Pai (internationalization)
 </li><li>Paolo Caruccio (SQLFORM.grid query)
+</li><li>Paolo Pastori
 </li><li>Patrick Breitenbach
 </li><li><a href="mailto:phyo.arkarlwin@star-nix.net">Phyo Arkar Lwin</a> (web hosting and Jython tester)
 </li><li>Pierre Thibault (<a href="http://code.google.com/p/neo-web2py2eclipse/">Eclipse integration</a> and custom import)
@@ -149,12 +150,13 @@
 
 <li><a href="http://www.python.org">Python</a> created by Guido van Rossum.</li>
 <li>Rocket Web Server developed by Timothy Farrell.</li>
-<li><a href="http://codemirror.net/">CodeMirror</a></li>s
+<li><a href="http://codemirror.net/">CodeMirror</a></li>
+
 <li><a href="http://pyrtf.sourceforge.net/">PyRTF</a> developed by Simon Cusack and revised by Grant Edwards</li>
 <li><a href="http://www.dalkescientific.com/Python/PyRSS2Gen.html">PyRSS2Gen</a> developed by Dalke Scientific Software</li>
 <li><a href="http://www.feedparser.org/">feedparser</a> developed by Mark Pilgrim</li>
 <li><a href="http://code.google.com/p/python-markdown2/">markdown2</a> developed by Trent Mick</li>
-<li><a href="http://svn.saddi.com/py-lib/trunk/fcgi.py">fcgi.py</a> devloped by Allan Saddi (for production Lighttpd servers)</li>
+<li><a href="http://svn.saddi.com/py-lib/trunk/fcgi.py">fcgi.py</a> developed by Allan Saddi (for production Lighttpd servers)</li>
 <li><a href="http://www.danga.com/memcached/">memcache</a> developed by Evan Martin</li>
 <li><a href="http://jquery.com/">jQuery</a> developed by John Resig</li>
 <li>A syntax highlighter inspired by the code of <a href="http://www.petersblog.org/node/763">Peter Wilkinson</a></li>

applications/examples/views/generic.html

@@ -7,7 +7,7 @@ It is used as default when a view is not provided for your controllers
 """}}
 <h2>{{=' '.join(x.capitalize() for x in request.function.split('_'))}}</h2>
 {{if len(response._vars)==1:}}
-{{=BEAUTIFY(response._vars.values()[0])}}
+{{=BEAUTIFY(response._vars[next(iter(response._vars))])}}
 {{elif len(response._vars)>1:}}
 {{=BEAUTIFY(response._vars)}}
 {{pass}}

applications/examples/views/generic.load

@@ -1 +1 @@
-{{response.headers['web2py-response-flash']=response.flash}}{{if len(response._vars)==1:}}{{=response._vars.values()[0]}}{{else:}}{{=BEAUTIFY(response._vars)}}{{pass}}
+{{response.headers['web2py-response-flash']=response.flash}}{{if len(response._vars)==1:}}{{=response._vars[next(iter(response._vars))]}}{{else:}}{{=BEAUTIFY(response._vars)}}{{pass}}

applications/welcome/controllers/appadmin.py

@@ -12,11 +12,6 @@ import gluon.contenttype
 import gluon.fileutils
 from gluon._compat import iteritems
 
-try:
-    import pygraphviz as pgv
-except ImportError:
-    pgv = None
-
 is_gae = request.env.web2py_runtime_gae or False
 
 # ## critical --- make a copy of the environment
@@ -35,7 +30,7 @@ except:
 
 if request.is_https:
     session.secure()
-elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1") and \
+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'))
 
@@ -51,7 +46,7 @@ if request.function == 'manage':
                                       auth.table_permission()])
     manager_role = manager_action.get('role', None) if manager_action else None
     if not (gluon.fileutils.check_credentials(request) or auth.has_membership(manager_role)):
-        raise HTTP(403, "Not authorized")
+        raise HTTP(403, 'Not authorized')
     menu = False
 elif (request.application == 'admin' and not session.authorized) or \
         (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
@@ -187,12 +182,12 @@ def select():
     db = get_database(request)
     dbname = request.args[0]
     try:
-        is_imap = db._uri.startswith("imap://")
+        is_imap = db._uri.startswith('imap://')
     except (KeyError, AttributeError, TypeError):
         is_imap = False
-    regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
+    regex = re.compile(r'(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
     if len(request.args) > 1 and hasattr(db[request.args[1]], '_primarykey'):
-        regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
+        regex = re.compile(r'(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
     if request.vars.query:
         match = regex.match(request.vars.query)
         if match:
@@ -229,20 +224,20 @@ def select():
     session.last_orderby = orderby
     session.last_query = request.vars.query
     form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
-                _name='query', _value=request.vars.query or '',
+                _name='query', _value=request.vars.query or '', _class='form-control',
                 requires=IS_NOT_EMPTY(
-                    error_message=T("Cannot be empty")))), TR(T('Update:'),
+                    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 '', _class='form-control')), TR(T('Delete:'), INPUT(_name='delete_check',
                 _class='delete', _type='checkbox', value=False), ''),
-                TR('', '', INPUT(_type='submit', _value=T('submit')))),
+                TR('', '', INPUT(_type='submit', _value=T('Submit'), _class='btn btn-primary'))),
                 _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+)\..+')
+        regex = re.compile(request.args[0] + r'\.(?P<table>\w+)\..+')
         match = regex.match(form.vars.query.strip())
         if match:
             table = match.group('table')
@@ -259,8 +254,8 @@ def select():
 
             if is_imap:
                 fields = [db[table][name] for name in
-                    ("id", "uid", "created", "to",
+                    ('id', 'uid', 'created', 'to',
-                     "sender", "subject")]
+                     'sender', 'subject')]
             if orderby:
                 rows = db(query, ignore_common_filters=True).select(
                               *fields, limitby=(start, stop),
@@ -276,10 +271,10 @@ def select():
     # begin handle upload csv
     csv_table = table or request.vars.table
     if csv_table:
-        formcsv = FORM(str(T('or import from csv file')) + " ",
+        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')))
+                       INPUT(_type='submit', _value=T('import'), _class='btn btn-primary'))
     else:
         formcsv = None
     if formcsv and formcsv.process().accepted:
@@ -361,26 +356,26 @@ def state():
 def ccache():
     if is_gae:
         form = FORM(
-            P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")))
+            P(TAG.BUTTON(T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')))
     else:
         cache.ram.initialize()
         cache.disk.initialize()
 
         form = FORM(
             P(TAG.BUTTON(
-                T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+                T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')),
             P(TAG.BUTTON(
-                T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+                T('Clear RAM'), _type='submit', _name='ram', _value='ram')),
             P(TAG.BUTTON(
-                T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+                T('Clear DISK'), _type='submit', _name='disk', _value='disk')),
         )
 
     if form.accepts(request.vars, session):
-        session.flash = ""
+        session.flash = ''
         if is_gae:
             if request.vars.yes:
                 cache.ram.clear()
-                session.flash += T("Cache Cleared")
+                session.flash += T('Cache Cleared')
         else:
             clear_ram = False
             clear_disk = False
@@ -392,17 +387,16 @@ def ccache():
                 clear_disk = True
             if clear_ram:
                 cache.ram.clear()
-                session.flash += T("Ram Cleared")
+                session.flash += T('Ram Cleared')
             if clear_disk:
                 cache.disk.clear()
-                session.flash += T("Disk Cleared")
+                session.flash += T('Disk Cleared')
         redirect(URL(r=request))
 
     try:
-        from guppy import hpy
+        from pympler.asizeof import asizeof
-        hp = hpy()
     except ImportError:
-        hp = False
+        asizeof = False
 
     import shelve
     import os
@@ -442,7 +436,7 @@ def ccache():
             gae_stats['ratio'] = ((gae_stats['hits'] * 100) /
                 (gae_stats['hits'] + gae_stats['misses']))
         except ZeroDivisionError:
-            gae_stats['ratio'] = T("?")
+            gae_stats['ratio'] = T('?')
         gae_stats['oldest'] = GetInHMS(time.time() - gae_stats['oldest_item_age'])
         total.update(gae_stats)
     else:
@@ -456,9 +450,9 @@ def ccache():
             ram['ratio'] = 0
 
         for key, value in iteritems(cache.ram.storage):
-            if hp:
+            if asizeof:
-                ram['bytes'] += hp.iso(value[1]).size
+                ram['bytes'] += asizeof(value[1])
-                ram['objects'] += hp.iso(value[1]).count
+                ram['objects'] += 1
             ram['entries'] += 1
             if value[0] < ram['oldest']:
                 ram['oldest'] = value[0]
@@ -474,9 +468,9 @@ def ccache():
                 except (KeyError, ZeroDivisionError):
                     disk['ratio'] = 0
             else:
-                if hp:
+                if asizeof:
-                    disk['bytes'] += hp.iso(value[1]).size
+                    disk['bytes'] += asizeof(value[1])
-                    disk['objects'] += hp.iso(value[1]).count
+                    disk['objects'] += 1
                 disk['entries'] += 1
                 if value[0] < disk['oldest']:
                     disk['oldest'] = value[0]
@@ -508,7 +502,7 @@ def ccache():
             TR(TD(B(T('Key'))), TD(B(T('Time in Cache (h:m:s)')))),
             *[TR(TD(k[0]), TD('%02d:%02d:%02d' % k[1])) for k in keys],
             **dict(_class='cache-keys',
-                   _style="border-collapse: separate; border-spacing: .5em;"))
+                   _style='border-collapse: separate; border-spacing: .5em;'))
 
     if not is_gae:
         ram['keys'] = key_table(ram['keys'])
@@ -516,7 +510,7 @@ def ccache():
         total['keys'] = key_table(total['keys'])
 
     return dict(form=form, total=total,
-                ram=ram, disk=disk, object_stats=hp != False)
+                ram=ram, disk=disk, object_stats=asizeof != False)
 
 
 def table_template(table):
@@ -542,80 +536,29 @@ def table_template(table):
     # This is horribe HTML but the only one graphiz understands
     rows = []
     cellpadding = 4
-    color = "#000000"
+    color = '#000000'
-    bgcolor = "#FFFFFF"
+    bgcolor = '#FFFFFF'
-    face = "Helvetica"
+    face = 'Helvetica'
-    face_bold = "Helvetica Bold"
+    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)))
+                           _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,
+                              _align='left', _cellpadding=cellpadding,
                               _border=border),
                        TD(FONT(row.type, _color=color, _face=face),
-                               _align="left", _cellpadding=cellpadding,
+                               _align='left', _cellpadding=cellpadding,
                                _border=border),
                        TD(FONT(types(row), _color=color, _face=face),
-                               _align="center", _cellpadding=cellpadding,
+                               _align='center', _cellpadding=cellpadding,
                                _border=border)))
-    return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
+    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=request.application, color='#ECECEC')
-
-        group = meta_graphmodel['group'].replace(' ', '')
-        if group not in subgraphs:
-            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
-        subgraphs[group]['tables'].append(tablename)
-
-        graph.add_node(tablename, name=tablename, shape='plaintext',
-                       label=table_template(tablename))
-
-    for n, key in enumerate(subgraphs.iterkeys()):
-        graph.subgraph(nbunch=subgraphs[key]['tables'],
-                    name='cluster%d' % n,
-                    style='filled',
-                    color=subgraphs[key]['meta']['color'],
-                    label=subgraphs[key]['meta']['group'])
-
-    for tablename in db.tables:
-        for field in db[tablename]:
-            f_type = field.type
-            if isinstance(f_type,str) and (
-                f_type.startswith('reference') or
-                f_type.startswith('list:reference')):
-                referenced_table = f_type.split()[1].split('.')[0]
-                n1 = graph.get_node(tablename)
-                n2 = graph.get_node(referenced_table)
-                graph.add_edge(n1, n2, color="#4C4C4C", label='')
-
-    graph.layout()
-    if not request.args:
-        response.headers['Content-Type'] = 'image/png'
-        return graph.draw(format='png', prog='dot')
-    else:
-        response.headers['Content-Disposition']='attachment;filename=graph.%s'%request.args(0)
-        if request.args(0) == 'dot':
-            return graph.string()
-        else:
-            return graph.draw(format=request.args(0), prog='dot')
-
-def graph_model():
-    return dict(databases=databases, pgv=pgv)
-
 def manage():
     tables = manager_action['tables']
     if isinstance(tables[0], str):
@@ -645,7 +588,7 @@ def manage():
         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]
+            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():
@@ -661,13 +604,13 @@ def manage():
 def hooks():
     import functools
     import inspect
-    list_op=['_%s_%s' %(h,m) for h in ['before', 'after'] for m in ['insert','update','delete']]
+    list_op = ['_%s_%s' %(h,m) for h in ['before', 'after'] for m in ['insert','update','delete']]
-    tables=[]
+    tables = []
-    with_build_it=False
+    with_build_it = False
     for db_str in sorted(databases):
         db = databases[db_str]
         for t in db.tables:
-            method_hooks=[]
+            method_hooks = []
             for op in list_op:
                 functions = []
                 for f in getattr(db[t], op):
@@ -687,16 +630,64 @@ def hooks():
                         except:
                             pass
                 if len(functions):
-                    method_hooks.append({'name':op, 'functions':functions})
+                    method_hooks.append({'name': op, 'functions':functions})
             if len(method_hooks):
-                tables.append({'name':"%s.%s" % (db_str,t), 'slug': IS_SLUG()("%s.%s" % (db_str,t))[0], 'method_hooks':method_hooks})
+                tables.append({'name': '%s.%s' % (db_str, t), 'slug': IS_SLUG()('%s.%s' % (db_str,t))[0], 'method_hooks':method_hooks})
     # Render
     ul_main = UL(_class='nav nav-list')
     for t in tables:
         ul_main.append(A(t['name'], _onclick="collapse('a_%s')" % t['slug']))
-        ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
+        ul_t = UL(_class='nav nav-list', _id='a_%s' % t['slug'], _style='display:none')
         for op in t['method_hooks']:
-            ul_t.append(LI (op['name']))
+            ul_t.append(LI(op['name']))
-            ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
+            ul_t.append(UL([LI(A(f['funcname'], _class='editor_filelink', _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main
+
+
+# ##########################################################
+# d3 based model visualizations
+# ###########################################################
+
+def d3_graph_model():
+    ''' See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
+    and also the app_admin bg_graph_model function
+
+    Create a list of table dicts, called 'nodes'
+    '''
+
+    nodes = []
+    links = []
+
+    for database in databases:
+        db = eval_in_global_env(database)
+        for tablename in db.tables:
+            fields = []
+            for field in db[tablename]:
+                f_type = field.type
+                if not isinstance(f_type, str):
+                    disp = ' '
+                elif f_type == 'string':
+                    disp = field.length
+                elif f_type == 'id':
+                    disp = 'PK'
+                elif f_type.startswith('reference') or \
+                    f_type.startswith('list:reference'):
+                    disp = 'FK'
+                else:
+                    disp = ' '
+                fields.append(dict(name=field.name, type=field.type, disp=disp))
+
+                if isinstance(f_type, str) and (
+                    f_type.startswith('reference') or
+                    f_type.startswith('list:reference')):
+                    referenced_table = f_type.split()[1].split('.')[0]
+
+                    links.append(dict(source=tablename, target = referenced_table))
+
+            nodes.append(dict(name=tablename, type='table', fields = fields))
+
+    # d3 v4 allows individual modules to be specified.  The complete d3 library is included below.
+    response.files.append(URL('admin','static','js/d3.min.js'))
+    response.files.append(URL('admin','static','js/d3_graph.js'))
+    return dict(databases=databases, nodes=nodes, links=links)

applications/welcome/controllers/default.py

@@ -1,26 +1,35 @@
 # -*- coding: utf-8 -*-
-# this file is released under public domain and you can use without limitations
-
 # -------------------------------------------------------------------------
 # This is a sample controller
-# - index is the default action of any application
+# this file is released under public domain and you can use without limitations
-# - user is required for authentication and authorization
-# - download is for downloading files uploaded in the db (does streaming)
 # -------------------------------------------------------------------------
 
-
+# ---- example index page ----
 def index():
-    """
-    example action using the internationalization operator T and flash
-    rendered by views/default/index.html or views/generic.html
-
-    if you need a simple wiki simply replace the two lines below with:
-    return auth.wiki()
-    """
     response.flash = T("Hello World")
     return dict(message=T('Welcome to web2py!'))
 
+# ---- API (example) -----
+@auth.requires_login()
+def api_get_user_email():
+    if not request.env.request_method == 'GET': raise HTTP(403)
+    return response.json({'status':'success', 'email':auth.user.email})
 
+# ---- Smart Grid (example) -----
+@auth.requires_membership('admin') # can only be accessed by members of admin groupd
+def grid():
+    response.view = 'generic.html' # use a generic view
+    tablename = request.args(0)
+    if not tablename in db.tables: raise HTTP(403)
+    grid = SQLFORM.smartgrid(db[tablename], args=[tablename], deletable=False, editable=False)
+    return dict(grid=grid)
+
+# ---- Embedded wiki (example) ----
+def wiki():
+    auth.wikimenu() # add the wiki to the menu
+    return auth.wiki() 
+
+# ---- Action for login/register/etc (required for auth) -----
 def user():
     """
     exposes:
@@ -39,7 +48,7 @@ def user():
     """
     return dict(form=auth())
 
-
+# ---- action to server uploaded static content (required) ---
 @cache.action()
 def download():
     """
@@ -47,15 +56,3 @@ def download():
     http://..../[app]/default/download/[filename]
     """
     return response.download(request, db)
-
-
-def call():
-    """
-    exposes services. for example:
-    http://..../[app]/default/call/jsonrpc
-    decorate with @services.jsonrpc the functions to expose
-    supports xml, json, xmlrpc, jsonrpc, amfrpc, rss, csv
-    """
-    return service()
-
-

applications/welcome/cron/crontab.example

@@ -1 +0,0 @@
-#crontab

applications/welcome/languages/ar.py

@@ -18,16 +18,31 @@
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '@markmin\x01**Hello World**': '**مرحباً بالعالم**',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
+'A new password was emailed to you': 'A new password was emailed to you',
 'About': 'نبذة',
 'Access Control': 'متحكمات الوصول',
 'admin': 'admin',
 'Administrative Interface': 'واجهة التحكم',
 'Ajax Recipes': 'وصفات أجاكس',
 'An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'API Example': 'API Example',
 'appadmin is disabled because insecure channel': 'appadmin is disabled because insecure channel',
+'Apply changes': 'Apply changes',
 'Are you sure you want to delete this object?': 'هل أنت متأكد بحذف هذا الكائن ؟',
+'Authentication code': 'Authentication code',
 'Available Databases and Tables': 'Available Databases and Tables',
 'Buy this book': 'أشتري هذا الكتاب',
 "Buy web2py's book": "Buy web2py's book",
@@ -37,10 +52,13 @@
 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Cache Keys': 'Cache Keys',
 'Cannot be empty': 'لا يمكن بأن يكون خالي',
+'Change Password': 'Change Password',
+'Change password': 'Change password',
 'Check to delete': 'أختر للحذف',
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Client IP': 'IP المستخدم',
 'Community': 'المجتمع',
 'Components and Plugins': 'العناصر والإضافات',
@@ -76,6 +94,9 @@
 'E-mail': 'البريد الإلكتروني',
 'Edit current record': 'Edit current record',
 'Email and SMS': 'البريد الإلكتروني والرسالة النصية',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'enter an integer between %(min)g and %(max)g': 'أدخل عدد صحيح بين %(min)g و %(man)g',
 'enter date and time as %(format)s': 'أدخل التاريخ والوقت كالنمط %(format)',
 'Errors': 'الأخطاء',
@@ -84,8 +105,11 @@
 'First name': 'الأسم الأول',
 'Forms and Validators': 'الإستمارات والمدققات',
 'Free Applications': 'تطبيقات مجانية',
+'Function disabled': 'Function disabled',
 'Graph Model': 'Graph Model',
+'Grid Example': 'Grid Example',
 'Group %(group_id)s created': 'المجموعة %(group_id)s قد أنشئت',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'هوية المجموعة',
 'Group uniquely assigned to user %(id)s': 'المجموعة مخصصة للمستخدم %(id)s',
 'Groups': 'مجموعات',
@@ -98,13 +122,23 @@
 'How did you get here?': 'كيف أستطعت الوصول إلى هنا ؟',
 'import': 'import',
 'Import/Export': 'Import/Export',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
+'Insufficient privileges': 'Insufficient privileges',
 'Internal State': 'Internal State',
 'Introduction': 'مقدمة',
 'Invalid email': 'بريد إلكتروني غير صالح',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
+'Invalid password': 'Invalid password',
 'Invalid Query': 'Invalid Query',
 'invalid request': 'invalid request',
+'Invalid reset password': 'Invalid reset password',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Is Active': 'نشط',
 'Key': 'Key',
+'Key verified': 'Key verified',
 'Last name': 'أسم العائلة',
 'Layout': 'النسق',
 'Layout Plugins': 'نسّق الإضافات',
@@ -114,9 +148,11 @@
 'Logged in': 'تم تسجيل الدخول',
 'Logged out': 'تم تسجيل الخروج',
 'Login': 'تسجيل الدخول',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Logout': 'تسجيل الخروج',
 'Lost Password': 'فقدت كلمة المرور',
 'Lost password?': 'هل فقدت كلمة المرور ؟',
+'Lost your password?': 'Lost your password?',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
 'Manage Cache': 'Manage Cache',
@@ -126,12 +162,14 @@
 'Modified On': 'عُدلت في',
 'My Sites': 'موقعي',
 'Name': 'الأسم',
+'New password': 'New password',
 'New Record': 'New Record',
 'new record inserted': 'new record inserted',
 'next %s rows': 'next %s rows',
 'No databases in this application': 'No databases in this application',
 'Number of entries: **%s**': 'Number of entries: **%s**',
 'Object or table name': 'أسم الكائن أو الجدول',
+'Old password': 'Old password',
 'Online book': 'Online book',
 'Online examples': 'أمثلة على الأنترنت',
 'or import from csv file': 'or import from csv file',
@@ -140,7 +178,10 @@
 'Other Recipes': 'وصفات أخرى',
 'Overview': 'نظرة عامة',
 'Password': 'كلمة المرور',
+'Password changed': 'Password changed',
 "Password fields don't match": 'حقول كلمة المرور لا تتطابق',
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'please input your password again': 'الرجاء إعادة إدخال كلمة المرور',
@@ -149,6 +190,7 @@
 'Preface': 'المدخل',
 'previous %s rows': 'previous %s rows',
 'Profile': 'الملف الشخصي',
+'Profile updated': 'Profile updated',
 'pygraphviz library not found': 'pygraphviz library not found',
 'Python': 'بايثون',
 'Query:': 'Query:',
@@ -159,14 +201,24 @@
 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Recipes': 'وصفات',
 'Record': 'Record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'record does not exist',
 'Record ID': 'هوية السجل ',
 'Record id': 'Record id',
+'Record Updated': 'Record Updated',
 'Register': 'التسجيل',
 'Registration identifier': 'مُعرف التسجيل',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'رمز التسجيل',
+'Registration needs verification': 'Registration needs verification',
 'Registration successful': 'تم التسجيل بنجاح',
 'Remember me (for 30 days)': 'تذكرني ( إلى 30 يوم)',
+'Request reset password': 'Request reset password',
 'Reset Password key': 'إعادة ظبط مفتاح كلمة المرور',
 'Role': 'دور',
 'Roles': 'Roles',
@@ -176,11 +228,13 @@
 'Semantic': 'دليل لفظي',
 'Services': 'خدمات',
 'Sign Up': 'Sign Up',
+'Sign up': 'Sign up',
 'Size of cache:': 'Size of cache:',
 'state': 'state',
 'Statistics': 'Statistics',
 'Stylesheet': 'أسلوب النمط',
 'submit': 'submit',
+'Submit': 'Submit',
 'Support': 'الدعم',
 'Table': 'Table',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
@@ -188,28 +242,50 @@
 'The output of the file is a dictionary that was rendered by the view %s': 'نتاج هذا الملف هو قاموس قًدم بواسطة العارض %s',
 'The Views': 'المشاهدات',
 'This App': 'هذا التطبيق',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
+'This email already has an account': 'This email already has an account',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': 'البصمة الزمنية',
 'Traceback': 'Traceback',
 'Twitter': 'تويتر',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'unable to parse csv file': 'unable to parse csv file',
+'Unable to send email': 'Unable to send email',
 'Update:': 'Update:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
 'User %(id)s Logged-in': 'المستخدم %(id)s قد سجل دخوله',
 'User %(id)s Logged-out': 'المستخدم %(id)s قد سجل خروجه',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
 'User %(id)s Registered': 'المستخدم %(id)s مسجل',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'هوية المستخدم',
+'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'value already in database or empty': 'القيمة موجودة مسبقاً أو فارغة',
 'Verify Password': 'تأكيد كلمة المرور',
 'Videos': 'الفيديوهات',
 'View': 'العرض',
 'Welcome': 'مرحباً',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome to web2py!': 'مرحباً بكم في ويب2 باي !',
 'Which called the function %s located in the file %s': 'الدالة المسماة %s موجودة في ملف %s',
+'Wiki Example': 'Wiki Example',
 'Working...': 'Working...',
 'You are successfully running web2py': 'أستطعت تثبيت web2py بنجاح !',
 'You can modify this application and adapt it to your needs': 'تستطيع تعديل هذا التطبيق لما يناسب إحتياجك',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You visited the url %s': ' ملقد زرت الرابط %s',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/welcome/languages/ca.py

@@ -16,9 +16,19 @@
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'Hi ha hagut un error, si us plau [[recarregui %s]] la pàgina',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
 '@markmin\x01Number of entries: **%s**': "Nombre d'entrades: **%s**",
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': 'Hi ha una nova versió de wep2py disponible',
 'A new version of web2py is available: %s': 'Hi ha una nova versió de wep2py disponible: %s',
 'About': 'Sobre',
@@ -44,6 +54,7 @@
 'And': 'I',
 'and rename it (required):': 'i renombri-la (requerit):',
 'and rename it:': " i renombri'l:",
+'API Example': 'API Example',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'admin inhabilitat, el canal no és segur',
 'application "%s" uninstalled': 'aplicació "%s" desinstal·lada',
@@ -60,6 +71,7 @@
 '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!': 'ATENCIO: no pot modificar la aplicació que està ejecutant-se!',
 'Authentication': 'Autenticació',
+'Authentication code': 'Authentication code',
 'Authentication failed at client DB!': '¡La autenticació ha fallat en la BDD client!',
 'Authentication failed at main DB!': '¡La autenticació ha fallat en la BDD principal!',
 'Available Databases and Tables': 'Bases de dades i taules disponibles',
@@ -170,6 +182,8 @@
 'Email': 'Email',
 'Email and SMS': 'Correu electrònic i SMS',
 'Email sent': 'Correu electrònic enviat',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'End of impersonation': 'Fi de suplantació',
 'enter a number between %(min)g and %(max)g': 'introdueixi un número entre %(min)g i %(max)g',
 'Enter a valid email address': 'Entri una adreça email vàlida',
@@ -205,9 +219,12 @@
 'Forgot username?': 'Ha oblidat el nom de usuari?',
 'Forms and Validators': 'Formularis i validadors',
 'Free Applications': 'Aplicacions Lliures',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Funcions sense doctests equivalen a pruebas [aceptades].',
 'Graph Model': 'Graph Model',
+'Grid Example': 'Grid Example',
 'Group %(group_id)s created': 'Grupo %(group_id)s creat',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'ID de Grup',
 'Group uniquely assigned to user %(id)s': 'Grup assignat únicament al usuari %(id)s',
 'Groups': 'Grups',
@@ -227,6 +244,7 @@
 'Import/Export': 'Importar/Exportar',
 'in': 'a',
 'includes': 'inclou',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Index': 'Índex',
 'insert new': 'inserti nou',
 'insert new %s': 'inserti nou %s',
@@ -238,14 +256,20 @@
 'Invalid action': 'Acció invàlida',
 'Invalid email': 'Correo electrónico invàlid',
 'invalid expression': 'expressió invàlida',
+'Invalid key': 'Invalid key',
 'Invalid login': 'Inici de sessió invàlida',
 'invalid password': 'contrasenya invàlida',
+'Invalid password': 'Invalid password',
 'Invalid Query': 'Consulta invàlida',
 'invalid request': 'sol·licitud invàlida',
 'Invalid reset password': 'Reinici de contrasenya invàlid',
 'invalid ticket': 'tiquet invàlid',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Is Active': 'Està Actiu',
 'Key': 'Clau',
+'Key verified': 'Key verified',
 'language file "%(filename)s" created/updated': 'fitxer de llenguatge "%(filename)s" creat/actualitzat',
 'Language files (static strings) updated': 'Fitxers de llenguatge (cadenes estàtiques) actualitzats',
 'languages': 'llenguatges',
@@ -272,6 +296,7 @@
 'Lost Password': 'Contrasenya perdida',
 'Lost password?': 'Ha oblidat la contrasenya?',
 'lost password?': '¿ha oblidat la contrasenya?',
+'Lost your password?': 'Lost your password?',
 'Main Menu': 'Menú principal',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
@@ -322,6 +347,7 @@
 'Password changed': 'Contrasenya cambiada',
 "Password fields don't match": 'Els camps de contrasenya no coincideixen',
 'Password reset': 'Reinici de contrasenya',
+'Password retrieve': 'Password retrieve',
 'Peeking at file': 'Visualitzant fitxer',
 'Permission': 'Permís',
 'Permissions': 'Permisos',
@@ -348,15 +374,22 @@
 'Recipes': 'Receptes',
 'Record': 'Registre',
 'Record %(id)s created': 'Registre %(id)s creat',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
 'Record Created': 'Registre Creat',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'el registre no existe',
 'Record ID': 'ID de Registre',
 'Record id': 'Id de registre',
+'Record Updated': 'Record Updated',
 'Ref APB': 'Ref APB',
 'register': "registri's",
 'Register': "Registri's",
 'Registration identifier': 'Identificador de Registre',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Clau de registre',
+'Registration needs verification': 'Registration needs verification',
 'Registration successful': 'Registre amb èxit',
 'reload': 'recarregar',
 'Remember me (for 30 days)': "Recordi'm (durant 30 dies)",
@@ -382,6 +415,7 @@
 'session expired': 'sessió expirada',
 'shell': 'terminal',
 'Sign Up': 'Sign Up',
+'Sign up': 'Sign up',
 'site': 'lloc',
 'Size of cache:': 'Mida de la Caché:',
 'Slug': 'Slug',
@@ -420,6 +454,7 @@
 'There are no views': 'No hi ha vistes',
 'these files are served without processing, your images go here': 'aquests fitxers són servits sense processar, les seves imatges van aquí',
 'This App': 'Aquesta Aplicació',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 'This email already has an account': 'Aquest correu electrònic ja té un compte',
 'This is a copy of the scaffolding application': 'Aquesta és una còpia de la aplicació de bastiment',
 'This is the %(filename)s template': 'Aquesta és la plantilla %(filename)s',
@@ -443,12 +478,14 @@
 'TSV (Spreadsheets)': 'TSV (Fulls de càlcul)',
 'TSV (Spreadsheets, hidden cols)': 'TSV (Fulls de càlcul, columnes amagades)',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'Unable to check for upgrades': 'No és possible verificar la existencia de actualitzacions',
 'unable to create application "%s"': 'no és possible crear la aplicació "%s"',
 'unable to delete file "%(filename)s"': 'no és possible eliminar el fitxer "%(filename)s"',
 'Unable to download': 'No és possible la descàrrega',
 'Unable to download app': 'No és possible descarregar la aplicació',
 'unable to parse csv file': 'no és possible analitzar el fitxer CSV',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'no és possible instalar "%s"',
 'uncheck all': 'desmarcar tots',
 'uninstall': 'desinstalar',
@@ -466,9 +503,12 @@
 'User %(id)s Logged-out': 'El usuari %(id)s finalitzà la sessió',
 'User %(id)s Password changed': 'Contrasenya del usuari %(id)s canviada',
 'User %(id)s Password reset': 'Contrasenya del usuari %(id)s reiniciada',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
 'User %(id)s Profile updated': 'Actualitzat el perfil del usuari %(id)s',
 'User %(id)s Registered': 'Usuari %(id)s Registrat',
 'User %(id)s Username retrieved': 'Se ha recuperat el nom de usuari del usuari %(id)s',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User %(username)s Logged-in': 'El usuari %(username)s inicià la sessió',
 "User '%(username)s' Logged-in": "El usuari '%(username)s' inicià la sessió",
 "User '%(username)s' Logged-out": "El usuari '%(username)s' finalitzà la sessió",
@@ -476,6 +516,7 @@
 'User ID': 'ID de Usuari',
 'User Logged-out': 'El usuari finalitzà la sessió',
 'Username': 'Nom de usuari',
+'Username already taken': 'Username already taken',
 'Username retrieve': 'Recuperar nom de usuari',
 'Users': 'Usuaris',
 'Value already in database or empty': 'El valor ya existeix en la base de dades o està buit',
@@ -496,10 +537,12 @@
 'web2py is up to date': 'web2py està actualitzat',
 'web2py Recent Tweets': 'Tweets Recents de web2py',
 'Welcome': 'Benvingut',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome %s': 'Benvingut %s',
 'Welcome to web2py': 'Benvingut a web2py',
 'Welcome to web2py!': '¡Benvingut a web2py!',
 'Which called the function %s located in the file %s': 'La qual va cridar la funció %s localitzada en el fitxer %s',
+'Wiki Example': 'Wiki Example',
 'Wiki Page': 'Wiki Page',
 'Working...': 'Treballant ...',
 'XML': 'XML',
@@ -507,6 +550,10 @@
 'YES': 'SÍ',
 'You are successfully running web2py': 'Vostè està executant web2py amb èxit',
 'You can modify this application and adapt it to your needs': 'Vostè pot modificar aquesta aplicació i adaptar-la a les seves necessitats',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You visited the url %s': 'Vostè va visitar la url %s',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
 'Your username is: %(username)s': 'El seu nom de usuari és: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/welcome/languages/cs.py

@@ -19,9 +19,21 @@
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(soubor **gluon/contrib/plural_rules/%s.py** nenalezen)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Searching: **%s** %%{file}': 'Hledání: **%s** %%{soubor}',
 '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
+'A new password was emailed to you': 'A new password was emailed to you',
 'About': 'O programu',
 'About application': 'O aplikaci',
 'Access Control': 'Řízení přístupu',
@@ -38,12 +50,14 @@
 'An error occured, please %s the page': 'An error occured, please %s the page',
 'An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
 'and rename it:': 'a přejmenovat na:',
+'API Example': 'API Example',
 '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:',
+'Apply changes': 'Apply changes',
 '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?',
@@ -53,6 +67,7 @@
 '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.',
+'Authentication code': 'Authentication code',
 'Available Databases and Tables': 'Dostupné databáze a tabulky',
 'back': 'zpět',
 'Back to wizard': 'Back to wizard',
@@ -75,6 +90,7 @@
 'Change Admin Password': 'Změnit heslo pro správu',
 'Change admin password': 'Změnit heslo pro správu aplikací',
 'Change password': 'Změna hesla',
+'Change Password': 'Change Password',
 'check all': 'vše označit',
 'Check for upgrades': 'Zkusit aktualizovat',
 'Check to delete': 'Označit ke smazání',
@@ -84,6 +100,7 @@
 'Clear CACHE?': 'Vymazat CACHE?',
 'Clear DISK': 'Vymazat DISK',
 'Clear RAM': 'Vymazat RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 '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',
@@ -168,6 +185,9 @@
 'Editing Language file': 'Úprava jazykového souboru',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Email and SMS': 'Email a SMS',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 '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',
@@ -201,6 +221,7 @@
 'Forms and Validators': 'Formuláře a validátory',
 'Frames': 'Frames',
 'Free Applications': 'Aplikace zdarma',
+'Function disabled': 'Function disabled',
 '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:',
@@ -211,8 +232,11 @@
 'Goto': 'Goto',
 'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'Grid Example': 'Grid Example',
 'Group %(group_id)s created': 'Skupina %(group_id)s vytvořena',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'ID skupiny',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Groups': 'Skupiny',
 'Hello World': 'Ahoj světe',
 'Help': 'Nápověda',
@@ -228,26 +252,35 @@
 'import': 'import',
 'Import/Export': 'Import/Export',
 'includes': 'zahrnuje',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 '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',
+'Insufficient privileges': 'Insufficient privileges',
 '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 key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'Invalid password': 'Nesprávné heslo',
 'invalid password.': 'neplatné heslo',
 'Invalid Query': 'Neplatný dotaz',
 'invalid request': 'Neplatný požadavek',
+'Invalid reset password': 'Invalid reset password',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 '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',
+'Key verified': 'Key verified',
 'languages': 'jazyky',
 'Languages': 'Jazyky',
 'Last name': 'Příjmení',
@@ -267,12 +300,14 @@
 'Logged out': 'Odhlášení proběhlo úspěšně',
 'Login': 'Přihlásit se',
 'login': 'přihlásit se',
+'Login disabled by administrator': 'Login disabled by administrator',
 '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?',
+'Lost your password?': 'Lost your password?',
 'Manage': 'Manage',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
@@ -321,11 +356,15 @@
 'pack plugin': 'pack plugin',
 'password': 'heslo',
 'Password': 'Heslo',
+'Password changed': 'Password changed',
 "Password fields don't match": 'Hesla se neshodují',
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Peeking at file': 'Peeking at file',
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Prosím',
+'please input your password again': 'please input your password again',
 'Plugin "%s" in application': 'Plugin "%s" in application',
 'plugins': 'zásuvné moduly',
 'Plugins': 'Zásuvné moduly',
@@ -338,6 +377,8 @@
 'Private files': 'Soukromé soubory',
 'private files': 'soukromé soubory',
 'profile': 'profil',
+'Profile': 'Profile',
+'Profile updated': 'Profile updated',
 'Project Progress': 'Vývoj projektu',
 'pygraphviz library not found': 'pygraphviz library not found',
 'Python': 'Python',
@@ -350,14 +391,24 @@
 'Readme': 'Nápověda',
 'Recipes': 'Postupy jak na to',
 'Record': 'Záznam',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'záznam neexistuje',
 'Record ID': 'ID záznamu',
 'Record id': 'id záznamu',
+'Record Updated': 'Record Updated',
 'refresh': 'obnovte',
 'register': 'registrovat',
 'Register': 'Zaregistrovat se',
 'Registration identifier': 'Registrační identifikátor',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Registrační klíč',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'reload': 'reload',
 'Reload routes': 'Znovu nahrát cesty',
 'Remember me (for 30 days)': 'Zapamatovat na 30 dní',
@@ -366,6 +417,7 @@
 'Replace': 'Zaměnit',
 'Replace All': 'Zaměnit vše',
 'request': 'request',
+'Request reset password': 'Request reset password',
 'Reset Password key': 'Reset registračního klíče',
 'response': 'response',
 'restart': 'restart',
@@ -392,6 +444,7 @@
 'Set Breakpoint on %s at line %s: %s': 'Bod přerušení nastaven v souboru %s na řádce %s: %s',
 'shell': 'příkazová řádka',
 'Sign Up': 'Sign Up',
+'Sign up': 'Sign up',
 'Singular Form': 'Singular Form',
 'Site': 'Správa aplikací',
 'Size of cache:': 'Velikost cache:',
@@ -436,6 +489,8 @@
 '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 code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
+'This email already has an account': 'This email already has an account',
 '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',
@@ -457,10 +512,12 @@
 'Try the mobile interface': 'Zkuste rozhraní pro mobilní zařízení',
 'try view': 'try view',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 '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',
+'Unable to send email': 'Unable to send email',
 'uncheck all': 'vše odznačit',
 'Uninstall': 'Odinstalovat',
 'update': 'aktualizovat',
@@ -477,14 +534,21 @@
 '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': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
 '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 Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
 '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)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'ID uživatele',
 'Username': 'Přihlašovací jméno',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'variables': 'variables',
 'Verify Password': 'Zopakujte heslo',
@@ -502,15 +566,22 @@
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
 'Welcome': 'Vítejte',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 '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.',
+'Wiki Example': 'Wiki Example',
 'Working...': 'Working...',
 '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 inspect variables using the console bellow': 'Níže pomocí příkazové řádky si můžete prohlédnout proměnné',
 '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 have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 '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 password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/welcome/languages/de.py

@@ -3,216 +3,155 @@
 '!langcode!': 'de',
 '!langname!': 'Deutsch (DE)',
 '"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 %%(shop)': '%s %%(shop)',
-'%s %%(shop[0])': '%s %%(shop[0])',
-'%s %%{quark[0]}': '%s %%{quark[0]}',
-'%s %%{row} deleted': '%s %%{row} gelöscht',
-'%s %%{row} updated': '%s %%{row} aktualisiert',
-'%s %%{shop[0]}': '%s %%{shop[0]}',
-'%s %%{shop}': '%s %%{shop}',
-'%s selected': '%s ausgewählt',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'%s %%{row} deleted': '%s %%{row} gelöscht',
+'%s %%{row} updated': '%s %%{row} aktualisiert',
+'%s selected': '%s ausgewählt',
 '(**%.0d MB**)': '(**%.0d MB**)',
-'**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{Item(Items)}, **%(bytes)s** %%{Byte(Bytes)}',
-'**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** Items, **%(bytes)s** %%{Byte(Bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**nicht verfügbar** (benötigt die Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] Bibliothek)',
 '?': '?',
-'@markmin\x01**Hello World**': '**Hallo Welt**',
-'@markmin\x01An error occured, please [[reload %s]] the page': 'Ein Fehler ist aufgetreten, bitte [[laden %s]] Sie die Seite neu',
-'``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**nicht verfügbar**``:rot (benötigt die Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] Bibliothek)',
 'About': 'Über',
 'Access Control': 'Zugangskontrolle',
-'admin': 'admin',
-'Administrative Interface': 'Administrationsoberfläche',
 'Ajax Recipes': 'Ajax Rezepte',
 'An error occured, please [[reload %s]] the page': 'Ein Fehler ist aufgetreten, bitte [[laden %s]] Sie die Seite neu',
-'appadmin is disabled because insecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
 'Are you sure you want to delete this object?': 'Sind Sie sich sicher, dass Sie dieses Objekt löschen wollen?',
 'Available Databases and Tables': 'Verfügbare Datenbanken und Tabellen',
-'Buy this book': 'Dieses Buch kaufen',
 "Buy web2py's book": "web2py's Buch kaufen",
-'cache': 'cache',
 'Cache': 'Cache',
 'Cache Cleared': 'Cache geleert',
-'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache enthält items die bis zu **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} alt sind.',
 'Cache Keys': 'Cache Schlüssel',
+'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache enthält items die bis zu **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} alt sind.',
 'Cannot be empty': 'Darf nicht leer sein',
 'Check to delete': 'Auswählen um zu löschen',
 'Clear CACHE?': 'CACHE löschen?',
 'Clear DISK': 'DISK löschen',
 'Clear RAM': 'RAM löschen',
-'Client IP': 'Client IP',
 'Community': 'Community',
 'Components and Plugins': 'Komponenten und Plugins',
 'Config.ini': 'Config.ini',
 'Controller': 'Controller',
 'Copyright': 'Copyright',
-'Created By': 'Erstellt von',
-'Created On': 'Erstellt am',
 'Current request': 'Derzeitiger Request',
 'Current response': 'Derzeitige Response',
 'Current session': 'Derzeitige Session',
-'customize me!': 'Pass mich an!',
+'DB Model': 'Muster-DB',
-'data uploaded': 'Datei hochgeladen',
+'DISK': 'DISK',
+'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK enthält items die bis zu **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} alt sind.',
 'Database': 'Datenbank',
 'Database %s select': 'Datenbank %s ausgewählt',
 'Database Administration (appadmin)': 'Datenbankadministration (appadmin)',
-'db': 'db',
-'DB Model': 'Muster-DB',
 'Delete:': 'Lösche:',
 'Demo': 'Demo',
 'Deployment Recipes': 'Entwicklungsrezepte',
-'Description': 'Beschreibung',
-'design': 'Design',
 'Design': 'Design',
-'DISK': 'DISK',
+'Disk Cache Keys': 'Festplatten-Cache-Schlüssel',
-'Disk Cache Keys': 'Disk Cache Keys',
 'Disk Cleared': 'Disk gelöscht',
-'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK enthält items die bis zu **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} alt sind.',
 'Documentation': 'Dokumentation',
 "Don't know what to do?": 'Wissen Sie nicht weiter?',
-'done!': 'Fertig!',
 'Download': 'Download',
-'E-mail': 'E-mail',
 'Edit current record': 'Diesen Eintrag editieren',
 'Email and SMS': 'Email und SMS',
-'Enter an integer between %(min)g and %(max)g': 'Eine Zahl zwischen %(min)g und %(max)g eingeben',
-'enter an integer between %(min)g and %(max)g': 'eine Zahl zwischen %(min)g und %(max)g eingeben',
-'enter date and time as %(format)s': 'ein Datum und eine Uhrzeit als %(format)s eingeben',
 'Errors': 'Fehlermeldungen',
-'export as csv file': 'als csv Datei exportieren',
 'FAQ': 'FAQ',
-'First name': 'Vorname',
 'Forms and Validators': 'Forms und Validators',
 'Free Applications': 'Kostenlose Anwendungen',
 'Graph Model': 'Muster-Graph',
-'Group %(group_id)s created': 'Gruppe %(group_id)s erstellt',
-'Group ID': 'Gruppen ID',
-'Group uniquely assigned to user %(id)s': 'Gruppe eindeutigem Benutzer %(id)s zugewiesen',
 'Groups': 'Gruppen',
 'Hello World': 'Hallo Welt',
-'Hello World  ## Kommentar': 'Hallo Welt  ',
+'Helping web2py': 'web 2py helfen',
-'Hello World## Kommentar': 'Hallo Welt',
-'Helping web2py': 'Helping web2py',
 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Trefferquote: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} und **%(misses)s** %%{miss(misses)})',
 'Home': 'Startseite',
 'How did you get here?': 'Wie sind Sie hier her gelangt?',
-'import': 'Importieren',
 'Import/Export': 'Importieren/Exportieren',
 'Internal State': 'Innerer Zustand',
 'Introduction': 'Einführung',
-'Invalid email': 'Ungültige Email',
 'Invalid Query': 'Ungültige Query',
-'invalid request': 'Ungültiger Request',
-'Is Active': 'Ist aktiv',
 'Key': 'Schlüssel',
-'Last name': 'Nachname',
 'Layout': 'Layout',
-'Layout Plugins': 'Layout Plugins',
-'Layouts': 'Layouts',
 'Live Chat': 'Live Chat',
 'Log In': 'Log In',
-'Logged in': 'Eingeloggt',
-'Logged out': 'Ausgeloggt',
-'Login': 'Einloggen',
-'Logout': 'Ausloggen',
 'Lost Password': 'Passwort vergessen',
-'Lost password?': 'Passwort vergessen?',
 'Manage %(action)s': '%(action)s verwalten',
 'Manage Access Control': 'Zugangskontrolle verwalten',
 'Manage Cache': 'Cache verwalten',
 'Memberships': 'Mitgliedschaften',
 'Menu Model': 'Menü-Muster',
-'Modified By': 'Verändert von',
-'Modified On': 'Verändert am',
 'My Sites': 'Meine Seiten',
-'Name': 'Name',
 'New Record': 'Neuer Eintrag',
-'new record inserted': 'neuer Eintrag hinzugefügt',
-'next %s rows': 'nächste %s Reihen',
 'No databases in this application': 'Keine Datenbank in dieser Anwendung',
 'Number of entries: **%s**': 'Nummer der Einträge: **%s**',
-'Object or table name': 'Objekt- oder Tabellenname',
 'Online book': 'Online Buch',
 'Online examples': 'Online Beispiele',
-'or import from csv file': 'oder von csv Datei importieren',
-'Origin': 'Ursprung',
-'Other Plugins': 'Andere Plugins',
 'Other Recipes': 'Andere Rezepte',
 'Overview': 'Überblick',
-'Password': 'Passwort',
-"Password fields don't match": 'Passwortfelder sind nicht gleich',
 'Permission': 'Erlaubnis',
 'Permissions': 'Erlaubnisse',
-'please input your password again': 'Bitte geben Sie ihr Passwort erneut ein',
 'Plugins': 'Plugins',
 'Powered by': 'Unterstützt von',
 'Preface': 'Allgemeines',
-'previous %s rows': 'vorherige %s Reihen',
-'Profile': 'Profil',
-'pygraphviz library not found': 'pygraphviz Bibliothek wurde nicht gefunden',
 'Python': 'Python',
 'Query:': 'Query:',
 'Quick Examples': 'Kurze Beispiele',
 'RAM': 'RAM',
-'RAM Cache Keys': 'RAM Cache Keys',
+'RAM Cache Keys': 'RAM Cache-Schlüssel',
-'Ram Cleared': 'Ram gelöscht',
 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM enthält items die bis zu **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} alt sind.',
+'Ram Cleared': 'Ram gelöscht',
 'Recipes': 'Rezepte',
 'Record': 'Eintrag',
-'record does not exist': 'Eintrag existiert nicht',
-'Record ID': 'ID des Eintrags',
 'Record id': 'id des Eintrags',
-'Register': 'Register',
-'Registration identifier': 'Registrierungsbezeichnung',
-'Registration key': 'Registierungsschlüssel',
-'Registration successful': 'Registrierung erfolgreich',
-'Remember me (for 30 days)': 'Eingeloggt bleiben (30 Tage lang)',
-'Reset Password key': 'Passwortschlüssel zurücksetzen',
 'Role': 'Rolle',
 'Roles': 'Rollen',
 'Rows in Table': 'Tabellenreihen',
 'Rows selected': 'Reihen ausgewählt',
 'Save model as...': 'Speichere Vorlage als...',
-'Semantic': 'Semantik',
 'Services': 'Dienste',
 'Sign Up': 'Registrieren',
 'Size of cache:': 'Cachegröße:',
-'state': 'Status',
 'Statistics': 'Statistik',
 'Stylesheet': 'Stylesheet',
-'submit': 'Submit',
 'Support': 'Support',
 'Table': 'Tabelle',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'Die "query" ist eine Bedingung wie "db.tabelle1.feld1==\'wert\'". So etwas wie "db.tabelle1.feld1==db.tabelle2.feld2" resultiert in einem SQL JOIN.',
 'The Core': 'Der Core',
-'The output of the file is a dictionary that was rendered by the view %s': 'Die Ausgabe der Datei ist ein "dictionary", welches vom "view" %s gerendert wurde',
 'The Views': 'Die Views',
+'The output of the file is a dictionary that was rendered by the view %s': 'Die Ausgabe der Datei ist ein "dictionary", welches vom "view" %s gerendert wurde',
 'This App': 'Diese App',
-'This email already has an account': 'Diese email besitzt bereits ein Konto',
 'Time in Cache (h:m:s)': 'Zeit im Cache (h:m:s)',
-'Timestamp': 'Zeitstempel',
 'Traceback': 'Zurückverfolgen',
 'Twitter': 'Twitter',
-'unable to parse csv file': 'csv Datei konnte nicht geparst werden',
 'Update:': 'Update:',
 '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 komplexere Queries zu erstellen.',
 'User': 'Benutzer',
-'User %(id)s Logged-in': 'Benutzer %(id)s hat sich eingeloggt',
-'User %(id)s Logged-out': 'Benutzer %(id)s hat sich ausgeloggt',
-'User %(id)s Registered': 'Benutzer %(id)s hat sich registriert',
-'User ID': 'Benutzer ID',
 'Users': 'Benutzer',
-'value already in database or empty': 'Wert ist bereits in der Datenbank oder leer',
-'Verify Password': 'Passwort überprüfen',
 'Videos': 'Videos',
 'View': 'Ansicht',
-'Welcome': 'Willkommen',
 'Welcome to web2py!': 'Willkommen bei web2py!',
 'Which called the function %s located in the file %s': 'Welche die Funktion %s in der Datei %s aufrief',
 'Working...': 'Arbeite...',
 'You are successfully running web2py': 'web2py wird erfolgreich ausgeführt',
 'You can modify this application and adapt it to your needs': 'Sie können diese Anwendung verändern und Ihren Bedürfnissen anpassen',
 'You visited the url %s': 'Sie haben die URL %s besucht',
+'``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**nicht verfügbar**``:rot (benötigt die Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] Bibliothek)',
+'admin': 'admin',
+'appadmin is disabled because insecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
+'cache': 'cache',
+'data uploaded': 'Datei hochgeladen',
+'db': 'db',
+'design': 'Design',
+'done!': 'Fertig!',
+'export as csv file': 'als csv Datei exportieren',
+'import': 'Importieren',
+'invalid request': 'Ungültiger Request',
+'new record inserted': 'neuer Eintrag hinzugefügt',
+'next %s rows': 'nächste %s Reihen',
+'or import from csv file': 'oder von csv Datei importieren',
+'previous %s rows': 'vorherige %s Reihen',
+'pygraphviz library not found': 'pygraphviz Bibliothek wurde nicht gefunden',
+'record does not exist': 'Eintrag existiert nicht',
+'state': 'Status',
+'submit': 'Submit',
+'unable to parse csv file': 'csv Datei konnte nicht geparst werden',
 }

applications/welcome/languages/en.py

@@ -13,14 +13,29 @@
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
+'A new password was emailed to you': 'A new password was emailed to you',
 'About': 'About',
 'Access Control': 'Access Control',
 'admin': 'admin',
 'Ajax Recipes': 'Ajax Recipes',
 'An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'API Example': 'API Example',
 'appadmin is disabled because insecure channel': 'appadmin is disabled because insecure channel',
+'Apply changes': 'Apply changes',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Authentication code': 'Authentication code',
 'Available Databases and Tables': 'Available Databases and Tables',
 "Buy web2py's book": "Buy web2py's book",
 'cache': 'cache',
@@ -29,10 +44,14 @@
 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Cache Keys': 'Cache Keys',
 'Cannot be empty': 'Cannot be empty',
+'Change Password': 'Change Password',
+'Change password': 'Change password',
 'Check to delete': 'Check to delete',
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
+'Client IP': 'Client IP',
 'Community': 'Community',
 'Components and Plugins': 'Components and Plugins',
 'Config.ini': 'Config.ini',
@@ -50,6 +69,7 @@
 'Delete:': 'Delete:',
 'Demo': 'Demo',
 'Deployment Recipes': 'Deployment Recipes',
+'Description': 'Description',
 'design': 'design',
 'Design': 'Design',
 'DISK': 'DISK',
@@ -60,14 +80,25 @@
 "Don't know what to do?": "Don't know what to do?",
 'done!': 'done!',
 'Download': 'Download',
+'E-mail': 'E-mail',
 'Edit current record': 'Edit current record',
 'Email and SMS': 'Email and SMS',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Errors': 'Errors',
 'export as csv file': 'export as csv file',
 'FAQ': 'FAQ',
+'First name': 'First name',
 'Forms and Validators': 'Forms and Validators',
 'Free Applications': 'Free Applications',
+'Function disabled': 'Function disabled',
 'Graph Model': 'Graph Model',
+'Grid Example': 'Grid Example',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Groups': 'Groups',
 'Hello World': 'Hello World',
 'Helping web2py': 'Helping web2py',
@@ -76,37 +107,68 @@
 'How did you get here?': 'How did you get here?',
 'import': 'import',
 'Import/Export': 'Import/Export',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
+'Insufficient privileges': 'Insufficient privileges',
 'Internal State': 'Internal State',
 'Introduction': 'Introduction',
+'Invalid email': 'Invalid email',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
+'Invalid password': 'Invalid password',
 'Invalid Query': 'Invalid Query',
 'invalid request': 'invalid request',
+'Invalid reset password': 'Invalid reset password',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
+'Last name': 'Last name',
 'Layout': 'Layout',
 'Live Chat': 'Live Chat',
 'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
+'Login': 'Login',
+'Login disabled by administrator': 'Login disabled by administrator',
+'Logout': 'Logout',
 'Lost Password': 'Lost Password',
+'Lost your password?': 'Lost your password?',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
 'Manage Cache': 'Manage Cache',
 'Memberships': 'Memberships',
 'Menu Model': 'Menu Model',
 'My Sites': 'My Sites',
+'Name': 'Name',
+'New password': 'New password',
 'New Record': 'New Record',
 'new record inserted': 'new record inserted',
 'next %s rows': 'next %s rows',
 'No databases in this application': 'No databases in this application',
 'Number of entries: **%s**': 'Number of entries: **%s**',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 'Online book': 'Online book',
 'Online examples': 'Online examples',
 'or import from csv file': 'or import from csv file',
+'Origin': 'Origin',
 'Other Recipes': 'Other Recipes',
 'Overview': 'Overview',
+'Password': 'Password',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Permission': 'Permission',
 'Permissions': 'Permissions',
+'please input your password again': 'please input your password again',
 'Plugins': 'Plugins',
 'Powered by': 'Powered by',
 'Preface': 'Preface',
 'previous %s rows': 'previous %s rows',
+'Profile': 'Profile',
+'Profile updated': 'Profile updated',
 'pygraphviz library not found': 'pygraphviz library not found',
 'Python': 'Python',
 'Query:': 'Query:',
@@ -117,8 +179,25 @@
 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Recipes': 'Recipes',
 'Record': 'Record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'record does not exist',
 'Record id': 'Record id',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
+'Register': 'Register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
+'Request reset password': 'Request reset password',
+'Reset Password key': 'Reset Password key',
 'Role': 'Role',
 'Roles': 'Roles',
 'Rows in Table': 'Rows in Table',
@@ -126,11 +205,13 @@
 'Save model as...': 'Save model as...',
 'Services': 'Services',
 'Sign Up': 'Sign Up',
+'Sign up': 'Sign up',
 'Size of cache:': 'Size of cache:',
 'state': 'state',
 'Statistics': 'Statistics',
 'Stylesheet': 'Stylesheet',
 'submit': 'submit',
+'Submit': 'Submit',
 'Support': 'Support',
 'Table': 'Table',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
@@ -138,20 +219,48 @@
 'The output of the file is a dictionary that was rendered by the view %s': 'The output of the file is a dictionary that was rendered by the view %s',
 'The Views': 'The Views',
 'This App': 'This App',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
+'This email already has an account': 'This email already has an account',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'Traceback': 'Traceback',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'unable to parse csv file': 'unable to parse csv file',
+'Unable to send email': 'Unable to send email',
 'Update:': 'Update:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
+'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
+'Verify Password': 'Verify Password',
 'Videos': 'Videos',
 'View': 'View',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome to web2py!': 'Welcome to web2py!',
 'Which called the function %s located in the file %s': 'Which called the function %s located in the file %s',
+'Wiki Example': 'Wiki Example',
 'Working...': 'Working...',
 'You are successfully running web2py': 'You are successfully running web2py',
 'You can modify this application and adapt it to your needs': 'You can modify this application and adapt it to your needs',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You visited the url %s': 'You visited the url %s',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/welcome/languages/es.py

@@ -8,17 +8,27 @@
 '%s %%{row} deleted': '%s %%{fila} %%{eliminada}',
 '%s %%{row} updated': '%s %%{fila} %%{actualizada}',
 '%s selected': '%s %%{seleccionado}',
-'%Y-%m-%d': '%d/%m/%A',
+'%Y-%m-%d': '%d/%m/%Y',
-'%Y-%m-%d %H:%M:%S': '%d/%m/%A %H:%M:%S',
+'%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
 '(**%.0d MB**)': '(**%.0d MB**)',
 '(something like "it-it")': '(algo como "it-it")',
 '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**no disponible** (requiere la libreria [[guppy http://pypi.python.org/pypi/guppy/ popup]] de Python)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
 '@markmin\x01An error occured, please [[reload %s]] the page': 'Ha ocurrido un error, por favor [[recargar %s]] la página',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
 '@markmin\x01Number of entries: **%s**': 'Número de entradas: **%s**',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**no disponible**``:red (Necesita libreria de Python: [[guppy http://pypi.python.org/pypi/guppy/ popup]])',
+'A new password was emailed to you': 'A new password was emailed to you',
 'A new version of web2py is available': 'Hay una nueva versión de web2py disponible',
 'A new version of web2py is available: %s': 'Hay una nueva versión de web2py disponible: %s',
 'About': 'Acerca de',
@@ -42,6 +52,7 @@
 'And': 'Y',
 'and rename it (required):': 'y renómbrela (requerido):',
 'and rename it:': ' y renómbrelo:',
+'API Example': 'API Example',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'appadmin deshabilitado, el canal no es seguro',
 'application "%s" uninstalled': 'aplicación "%s" desinstalada',
@@ -58,6 +69,7 @@
 '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 está ejecutandose!',
 'Authentication': 'Autenticación',
+'Authentication code': 'Authentication code',
 'Authentication failed at client DB!': '¡La autenticación ha fallado en la BDD cliente!',
 'Authentication failed at main DB!': '¡La autenticación ha fallado en la BDD principal!',
 'Available Databases and Tables': 'Bases de datos y tablas disponibles',
@@ -156,6 +168,8 @@
 'Editing file "%s"': 'Editando archivo "%s"',
 'Email and SMS': 'Correo electrónico y SMS',
 'Email sent': 'Correo electrónico enviado',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'End of impersonation': 'Fin de suplantación',
 'enter a number between %(min)g and %(max)g': 'introduzca un numero entre %(min)g y %(max)g',
 'enter a value': 'introduzca un valor',
@@ -184,9 +198,12 @@
 'Forgot username?': '¿Olvidó el nombre de usuario?',
 'Forms and Validators': 'Formularios y validadores',
 'Free Applications': 'Aplicaciones Libres',
+'Function disabled': 'Function disabled',
 'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
 'Graph Model': 'Modelo en Grafo',
+'Grid Example': 'Grid Example',
 'Group %(group_id)s created': 'Grupo %(group_id)s creado',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
 'Group ID': 'ID de Grupo',
 'Group uniquely assigned to user %(id)s': 'Grupo asignado únicamente al usuario %(id)s',
 'Groups': 'Grupos',
@@ -202,6 +219,7 @@
 'Import/Export': 'Importar/Exportar',
 'in': 'en',
 'includes': 'incluye',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Index': 'Índice',
 'insert new': 'inserte nuevo',
 'insert new %s': 'inserte nuevo %s',
@@ -213,14 +231,20 @@
 'Invalid action': 'Acción inválida',
 'Invalid email': 'Correo electrónico inválido',
 'invalid expression': 'expresión inválida',
+'Invalid key': 'Invalid key',
 'Invalid login': 'Inicio de sesión inválido',
 'invalid password': 'contraseña inválida',
+'Invalid password': 'Invalid password',
 'Invalid Query': 'Consulta inválida',
 'invalid request': 'Solicitud inválida',
 'Invalid reset password': 'Reinicio de contraseña inválido',
 'invalid ticket': 'Tiquete inválido',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Is Active': 'Está Activo',
 'Key': 'Llave',
+'Key verified': 'Key verified',
 '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',
@@ -246,6 +270,7 @@
 'Lost Password': 'Contraseña perdida',
 'Lost password?': '¿Olvidó la contraseña?',
 'lost password?': '¿olvidó la contraseña?',
+'Lost your password?': 'Lost your password?',
 'Main Menu': 'Menú principal',
 'Manage %(action)s': 'Gestionar %(action)s',
 'Manage Access Control': 'Gestionar control de acceso',
@@ -295,6 +320,7 @@
 'Password changed': 'Contraseña cambiada',
 "Password fields don't match": 'Los campos de contraseña no coinciden',
 'Password reset': 'Reinicio de contraseña',
+'Password retrieve': 'Password retrieve',
 'Peeking at file': 'Visualizando archivo',
 'Permission': 'Permiso',
 'Permissions': 'Permisos',
@@ -319,14 +345,21 @@
 'Recipes': 'Recetas',
 'Record': 'Registro',
 'Record %(id)s created': 'Registro %(id)s creado',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
 'Record Created': 'Registro Creado',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'el registro no existe',
 'Record ID': 'ID de Registro',
 'Record id': 'Id de registro',
+'Record Updated': 'Record Updated',
 'register': 'regístrese',
 'Register': 'Regístrese',
 'Registration identifier': 'Identificador de Registro',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Llave de registro',
+'Registration needs verification': 'Registration needs verification',
 'Registration successful': 'Registro con éxito',
 'reload': 'recargar',
 'Remember me (for 30 days)': 'Recuérdame (durante 30 días)',
@@ -351,6 +384,7 @@
 'session expired': 'sesión expirada',
 'shell': 'terminal',
 'Sign Up': 'Registrarse',
+'Sign up': 'Sign up',
 'site': 'sitio',
 'Size of cache:': 'Tamaño de la Caché:',
 'some files could not be removed': 'algunos archivos no pudieron ser removidos',
@@ -385,6 +419,7 @@
 'There are no views': 'No hay vistas',
 'these files are served without processing, your images go here': 'estos archivos son servidos sin procesar, sus imágenes van aquí',
 'This App': 'Esta Aplicación',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
 'This email already has an account': 'Este correo electrónico ya tiene una cuenta',
 'This is a copy of the scaffolding application': 'Esta es una copia de la aplicación de andamiaje',
 'This is the %(filename)s template': 'Esta es la plantilla %(filename)s',
@@ -405,12 +440,14 @@
 'TSV (Excel compatible)': 'TSV (compatible con Excel)',
 'TSV (Excel compatible, hidden cols)': 'TSV (compatible con Excel, columnas ocultas)',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 '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 download': 'No es posible la descarga',
 'Unable to download app': 'No es posible descargar la aplicación',
 'unable to parse csv file': 'no es posible analizar el archivo CSV',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'no es posible instalar "%s"',
 'uncheck all': 'desmarcar todos',
 'uninstall': 'desinstalar',
@@ -428,9 +465,12 @@
 'User %(id)s Logged-out': 'El usuario %(id)s finalizó la sesión',
 'User %(id)s Password changed': 'Contraseña del usuario %(id)s cambiada',
 'User %(id)s Password reset': 'Contraseña del usuario %(id)s reiniciada',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
 'User %(id)s Profile updated': 'Actualizado el perfil del usuario %(id)s',
 'User %(id)s Registered': 'Usuario %(id)s Registrado',
 'User %(id)s Username retrieved': 'Se ha recuperado el nombre de usuario del usuario %(id)s',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User %(username)s Logged-in': 'El usuario %(username)s inició la sesión',
 "User '%(username)s' Logged-in": "El usuario '%(username)s' inició la sesión",
 "User '%(username)s' Logged-out": "El usuario '%(username)s' finalizó la sesión",
@@ -438,6 +478,7 @@
 'User ID': 'ID de Usuario',
 'User Logged-out': 'El usuario finalizó la sesión',
 'Username': 'Nombre de usuario',
+'Username already taken': 'Username already taken',
 'Username retrieve': 'Recuperar nombre de usuario',
 'Users': 'Usuarios',
 'value already in database or empty': 'el valor ya existe en la base de datos o está vacío',
@@ -455,14 +496,20 @@
 'web2py is up to date': 'web2py está actualizado',
 'web2py Recent Tweets': 'Tweets Recientes de web2py',
 'Welcome': 'Bienvenido',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome %s': 'Bienvenido %s',
 'Welcome to web2py': 'Bienvenido a web2py',
 'Welcome to web2py!': '¡Bienvenido a web2py!',
 'Which called the function %s located in the file %s': 'La cual llamó la función %s localizada en el archivo %s',
+'Wiki Example': 'Wiki Example',
 'Working...': 'Trabajando...',
 'YES': 'SÍ',
 'You are successfully running web2py': 'Usted está ejecutando web2py exitosamente',
 'You can modify this application and adapt it to your needs': 'Usted puede modificar esta aplicación y adaptarla a sus necesidades',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You visited the url %s': 'Usted visitó la url %s',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
 'Your username is: %(username)s': 'Su nombre de usuario es: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/welcome/languages/fr-ca.py

@@ -3,8 +3,8 @@
 '!langcode!': 'fr-ca',
 '!langname!': 'Français (Canadien)',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" est une expression optionnelle comme "champ1=\'nouvellevaleur\'". Vous ne pouvez mettre à jour ou supprimer les résultats d\'un JOIN',
-'%s %%{row} deleted': '%s rangées supprimées',
+'%s %%{row} deleted': '%s lignes supprimées',
-'%s %%{row} updated': '%s rangées mises à jour',
+'%s %%{row} updated': '%s lignes mises à jour',
 '%s selected': '%s sélectionné',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
@@ -13,18 +13,33 @@
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
+'A new password was emailed to you': 'A new password was emailed to you',
 'about': 'à propos',
 'About': 'À propos',
 'Access Control': "Contrôle d'accès",
 'admin': 'admin',
-'Administrative Interface': 'Administrative Interface',
+'Administrative Interface': "Interface d'administration",
 'Administrative interface': "Interface d'administration",
 'Ajax Recipes': 'Recettes Ajax',
 'An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'API Example': 'API Example',
 'appadmin is disabled because insecure channel': "appadmin est désactivée parce que le canal n'est pas sécurisé",
+'Apply changes': 'Apply changes',
 'Are you sure you want to delete this object?': 'Êtes-vous sûr de vouloir supprimer cet objet?',
 'Authentication': 'Authentification',
+'Authentication code': 'Authentication code',
 'Available Databases and Tables': 'Bases de données et tables disponibles',
 'Buy this book': 'Acheter ce livre',
 "Buy web2py's book": "Buy web2py's book",
@@ -35,39 +50,44 @@
 'Cache Keys': 'Cache Keys',
 'Cannot be empty': 'Ne peut pas être vide',
 'change password': 'changer le mot de passe',
+'Change Password': 'Change Password',
+'Change password': 'Change password',
 'Check to delete': 'Cliquez pour supprimer',
 'Check to delete:': 'Cliquez pour supprimer:',
-'Clear CACHE?': 'Clear CACHE?',
+'Clear CACHE?': 'Vider le CACHE?',
-'Clear DISK': 'Clear DISK',
+'Clear DISK': 'Vider le DISQUE',
-'Clear RAM': 'Clear RAM',
+'Clear RAM': 'Vider la RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Client IP': 'IP client',
 'Community': 'Communauté',
-'Components and Plugins': 'Components and Plugins',
+'Components and Plugins': 'Composants et Plugiciels',
 'Config.ini': 'Config.ini',
 'Controller': 'Contrôleur',
 'Copyright': "Droit d'auteur",
+'Created By': 'Créé par',
+'Created On': 'Créé le',
 'Current request': 'Demande actuelle',
 'Current response': 'Réponse actuelle',
 'Current session': 'Session en cours',
 'customize me!': 'personnalisez-moi!',
 'data uploaded': 'données téléchargées',
 'Database': 'base de données',
-'Database %s select': 'base de données %s select',
+'Database %s select': 'base de données %s selectionnée',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'db': 'db',
-'DB Model': 'Modèle DB',
+'DB Model': 'Modèle BD',
 'Delete:': 'Supprimer:',
 'Demo': 'Démo',
-'Deployment Recipes': 'Recettes de déploiement ',
+'Deployment Recipes': 'Recettes de déploiement',
-'Description': 'Descriptif',
+'Description': 'Description',
 'design': 'design',
 'Design': 'Design',
-'DISK': 'DISK',
+'DISK': 'DISQUE',
 'Disk Cache Keys': 'Disk Cache Keys',
-'Disk Cleared': 'Disk Cleared',
+'Disk Cleared': 'Disque vidé',
 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Documentation': 'Documentation',
-"Don't know what to do?": "Don't know what to do?",
+"Don't know what to do?": 'Vous ne savez pas quoi faire?',
 'done!': 'fait!',
 'Download': 'Téléchargement',
 'E-mail': 'Courriel',
@@ -75,122 +95,163 @@
 'Edit current record': "Modifier l'enregistrement courant",
 'edit profile': 'modifier le profil',
 'Edit This App': 'Modifier cette application',
-'Email and SMS': 'Email and SMS',
+'Email and SMS': 'Courriel et texto',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
+'Enter an integer between %(min)g and %(max)g': 'Enter an integer between %(min)g and %(max)g',
 'enter an integer between %(min)g and %(max)g': 'entrer un entier compris entre %(min)g et %(max)g',
 'Errors': 'Erreurs',
 'export as csv file': 'exporter sous forme de fichier csv',
-'FAQ': 'faq',
+'FAQ': 'FAQ',
 'First name': 'Prénom',
 'Forms and Validators': 'Formulaires et Validateurs',
 'Free Applications': 'Applications gratuites',
 'Function disabled': 'Fonction désactivée',
-'Graph Model': 'Graph Model',
+'Graph Model': 'Représentation graphique du modèle',
+'Grid Example': 'Grid Example',
 'Group %(group_id)s created': '%(group_id)s groupe créé',
-'Group ID': 'Groupe ID',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'ID du groupe',
 'Group uniquely assigned to user %(id)s': "Groupe unique attribué à l'utilisateur %(id)s",
 'Groups': 'Groupes',
 'Hello World': 'Bonjour le monde',
-'Helping web2py': 'Helping web2py',
+'Helping web2py': 'Aider web2py',
 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
 'Home': 'Accueil',
 'How did you get here?': 'How did you get here?',
-'import': 'import',
+'import': 'importer',
 'Import/Export': 'Importer/Exporter',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Index': 'Index',
 'insert new': 'insérer un nouveau',
 'insert new %s': 'insérer un nouveau %s',
+'Insufficient privileges': 'Insufficient privileges',
 'Internal State': 'État interne',
 'Introduction': 'Présentation',
 'Invalid email': 'Courriel invalide',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
+'Invalid password': 'Invalid password',
 'Invalid Query': 'Requête Invalide',
 'invalid request': 'requête invalide',
-'Key': 'Key',
+'Invalid reset password': 'Invalid reset password',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
+'Is Active': 'Est actif',
+'Key': 'Clé',
+'Key verified': 'Key verified',
 'Last name': 'Nom',
 'Layout': 'Mise en page',
-'Layout Plugins': 'Layout Plugins',
+'Layout Plugins': 'Plugins de mise en page',
-'Layouts': 'layouts',
+'Layouts': 'Mises en page',
 'Live chat': 'Clavardage en direct',
-'Live Chat': 'Live Chat',
+'Live Chat': 'Clavardage en direct',
-'Log In': 'Log In',
+'Loading...': 'Chargement...',
+'loading...': 'chargement...',
+'Log In': 'Connexion',
 'Logged in': 'Connecté',
-'login': 'connectez-vous',
+'Logged out': 'Logged out',
-'Login': 'Connectez-vous',
+'login': 'connexion',
-'logout': 'déconnectez-vous',
+'Login': 'Connexion',
+'Login disabled by administrator': 'Login disabled by administrator',
+'logout': 'déconnexion',
+'Logout': 'Logout',
 'lost password': 'mot de passe perdu',
 'Lost Password': 'Mot de passe perdu',
+'Lost password?': 'Mot de passe perdu?',
 'lost password?': 'mot de passe perdu?',
+'Lost your password?': 'Lost your password?',
 'Main Menu': 'Menu principal',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
-'Manage Cache': 'Manage Cache',
+'Manage Cache': 'Gérer le Cache',
 'Memberships': 'Memberships',
 'Menu Model': 'Menu modèle',
-'My Sites': 'My Sites',
+'Modified By': 'Modifié par',
+'Modified On': 'Modifié le',
+'My Sites': 'Mes sites',
 'Name': 'Nom',
+'New password': 'New password',
 'New Record': 'Nouvel enregistrement',
 'new record inserted': 'nouvel enregistrement inséré',
-'next %s rows': 'next %s rows',
+'next %s rows': '%s prochaine lignes',
 'next 100 rows': '100 prochaines lignes',
 'No databases in this application': "Cette application n'a pas de bases de données",
 'Number of entries: **%s**': 'Number of entries: **%s**',
+'Object or table name': 'Objet ou nom de table',
+'Old password': 'Old password',
 'Online book': 'Online book',
 'Online examples': 'Exemples en ligne',
 'or import from csv file': "ou importer d'un fichier CSV",
 'Origin': 'Origine',
-'Other Plugins': 'Other Plugins',
+'Other Plugins': 'Autres Plugiciels',
 'Other Recipes': 'Autres recettes',
 'Overview': 'Présentation',
 'password': 'mot de passe',
 'Password': 'Mot de passe',
+'Password changed': 'Password changed',
 "Password fields don't match": 'Les mots de passe ne correspondent pas',
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Permission': 'Permission',
 'Permissions': 'Permissions',
-'please input your password again': "S'il vous plaît entrer votre mot de passe",
+'please input your password again': "S'il vous plaît entrer votre mot de passe à nouveau",
 'Plugins': 'Plugiciels',
 'Powered by': 'Alimenté par',
 'Preface': 'Préface',
-'previous %s rows': 'previous %s rows',
+'previous %s rows': '%s lignes précédentes',
 'previous 100 rows': '100 lignes précédentes',
-'profile': 'profile',
+'profile': 'profil',
-'pygraphviz library not found': 'pygraphviz library not found',
+'Profile': 'Profile',
+'Profile updated': 'Profile updated',
+'pygraphviz library not found': 'Bibliothèque pygraphviz introuvable',
 'Python': 'Python',
 'Query:': 'Requête:',
-'Quick Examples': 'Examples Rapides',
+'Quick Examples': 'Exemples Rapides',
 'RAM': 'RAM',
 'RAM Cache Keys': 'RAM Cache Keys',
-'Ram Cleared': 'Ram Cleared',
+'Ram Cleared': 'Ram vidée',
 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Readme': 'Lisez-moi',
 'Recipes': 'Recettes',
 'Record': 'enregistrement',
-'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s created': 'Enregistrement %(id)s créé',
-'Record %(id)s updated': 'Record %(id)s updated',
+'Record %(id)s deleted': 'Record %(id)s deleted',
-'Record Created': 'Record Created',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Enregistrement %(id)s modifié',
+'Record Created': 'Enregistrement créé',
+'Record Deleted': 'Record Deleted',
 'record does not exist': "l'archive n'existe pas",
-'Record ID': "ID d'enregistrement",
+'Record ID': "ID de l'enregistrement",
-'Record id': "id d'enregistrement",
+'Record id': "id de l'enregistrement",
-'Record Updated': 'Record Updated',
+'Record Updated': 'Enregistrement modifié',
 'Register': "S'inscrire",
 'register': "s'inscrire",
+'Registration identifier': "Identifiant d'inscription",
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': "Clé d'enregistrement",
+'Registration needs verification': 'Registration needs verification',
 'Registration successful': 'Inscription réussie',
 'Remember me (for 30 days)': 'Se souvenir de moi (pendant 30 jours)',
 'Request reset password': 'Demande de réinitialiser le mot clé',
 'Reset Password key': 'Réinitialiser le mot clé',
 'Resources': 'Ressources',
 'Role': 'Rôle',
-'Roles': 'Roles',
+'Roles': 'Rôles',
 'Rows in Table': 'Lignes du tableau',
 'Rows selected': 'Lignes sélectionnées',
-'Save model as...': 'Save model as...',
+'Save model as...': 'Enregistrer le modèle sous...',
 'Semantic': 'Sémantique',
 'Services': 'Services',
-'Sign Up': 'Sign Up',
+'Sign Up': "S'inscrire",
-'Size of cache:': 'Size of cache:',
+'Sign up': 'Sign up',
+'Size of cache:': 'Taille de la mémoire cache:',
 'state': 'état',
-'Statistics': 'Statistics',
+'Statistics': 'Statistiques',
 'Stylesheet': 'Feuille de style',
-'submit': 'submit',
+'submit': 'soumettre',
 'Submit': 'Soumettre',
 'Support': 'Soutien',
 'Sure you want to delete this object?': 'Êtes-vous sûr de vouloir supprimer cet objet?',
@@ -201,32 +262,55 @@
 'The output of the file is a dictionary that was rendered by the view %s': 'La sortie de ce fichier est un dictionnaire qui été restitué par la vue %s',
 'The Views': 'Les Vues',
 'This App': 'Cette Appli',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
+'This email already has an account': 'This email already has an account',
 'This is a copy of the scaffolding application': "Ceci est une copie de l'application échafaudage",
-'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Time in Cache (h:m:s)': 'Temps en Cache (h:m:s)',
 'Timestamp': 'Horodatage',
 'Traceback': 'Traceback',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'unable to parse csv file': "incapable d'analyser le fichier cvs",
+'Unable to send email': 'Unable to send email',
 'Update:': 'Mise à jour:',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Employez (...)&(...) pour AND, (...)|(...) pour OR, and ~(...)  pour NOT pour construire des requêtes plus complexes.',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Employez (...)&(...) pour AND, (...)|(...) pour OR, and ~(...)  pour NOT afin de construire des requêtes plus complexes.',
-'User': 'User',
+'User': 'Utilisateur',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
 'User %(id)s Logged-in': 'Utilisateur %(id)s connecté',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
 'User %(id)s Registered': 'Utilisateur %(id)s enregistré',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'ID utilisateur',
-'User Voice': 'User Voice',
+'User Voice': "Voix de l'utilisateur",
-'Users': 'Users',
+'Username': 'Username',
-'value already in database or empty': 'valeur déjà dans la base ou vide',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
+'Users': 'Utilisateurs',
+'value already in database or empty': 'valeur déjà dans la base ou inexistante',
 'Verify Password': 'Vérifiez le mot de passe',
 'Videos': 'Vidéos',
-'View': 'Présentation',
+'View': 'Vue',
 'Web2py': 'Web2py',
-'Welcome': 'Bienvenu',
+'Welcome': 'Bienvenue',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome %s': 'Bienvenue %s',
 'Welcome to web2py': 'Bienvenue à web2py',
-'Welcome to web2py!': 'Welcome to web2py!',
+'Welcome to web2py!': 'Bienvenue à web2py!',
 'Which called the function %s located in the file %s': 'Qui a appelé la fonction %s se trouvant dans le fichier %s',
-'Working...': 'Working...',
+'Wiki Example': 'Wiki Example',
-'You are successfully running web2py': 'Vous roulez avec succès web2py',
+'Working...': 'Traitement en cours...',
+'You are successfully running web2py': 'Vous exécutez avec succès web2py',
 'You can modify this application and adapt it to your needs': "Vous pouvez modifier cette application et l'adapter à vos besoins",
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You visited the url %s': "Vous avez visité l'URL %s",
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/welcome/languages/fr.py

@@ -13,7 +13,20 @@
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
+'A new password was emailed to you': 'A new password was emailed to you',
+'about': 'à propos',
 'About': 'À propos',
 'Access Control': "Contrôle d'accès",
 'admin': 'admin',
@@ -21,9 +34,12 @@
 'Administrative interface': "Interface d'administration",
 'Ajax Recipes': 'Recettes Ajax',
 'An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'API Example': 'API Example',
 'appadmin is disabled because insecure channel': "appadmin est désactivée parce que le canal n'est pas sécurisé",
+'Apply changes': 'Apply changes',
 'Are you sure you want to delete this object?': 'Êtes-vous sûr de vouloir supprimer cet objet?',
 'Authentication': 'Authentification',
+'Authentication code': 'Authentication code',
 'Available Databases and Tables': 'Bases de données et tables disponibles',
 'Buy this book': 'Acheter ce livre',
 "Buy web2py's book": "Buy web2py's book",
@@ -31,20 +47,23 @@
 'Cache': 'Cache',
 'Cache Cleared': 'Cache Cleared',
 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
-'Cache Keys': 'Clés de cache',
+'Cache Keys': 'Cache Keys',
 'Cannot be empty': 'Ne peut pas être vide',
 'change password': 'changer le mot de passe',
+'Change Password': 'Change Password',
+'Change password': 'Change password',
 'Check to delete': 'Cliquez pour supprimer',
 'Check to delete:': 'Cliquez pour supprimer:',
 'Clear CACHE?': 'Vider le CACHE?',
 'Clear DISK': 'Vider le DISQUE',
 'Clear RAM': 'Vider la RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Client IP': 'IP client',
 'Community': 'Communauté',
-'Components and Plugins': 'Composants et Plugins',
+'Components and Plugins': 'Composants et Plugiciels',
 'Config.ini': 'Config.ini',
 'Controller': 'Contrôleur',
-'Copyright': 'Copyright',
+'Copyright': "Droit d'auteur",
 'Created By': 'Créé par',
 'Created On': 'Créé le',
 'Current request': 'Demande actuelle',
@@ -55,8 +74,8 @@
 'Database': 'base de données',
 'Database %s select': 'base de données %s selectionnée',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
-'db': 'bdd',
+'db': 'db',
-'DB Model': 'Modèle BDD',
+'DB Model': 'Modèle BD',
 'Delete:': 'Supprimer:',
 'Demo': 'Démo',
 'Deployment Recipes': 'Recettes de déploiement',
@@ -71,12 +90,16 @@
 "Don't know what to do?": 'Vous ne savez pas quoi faire?',
 'done!': 'fait!',
 'Download': 'Téléchargement',
-'E-mail': 'E-mail',
+'E-mail': 'Courriel',
 'Edit': 'Éditer',
 'Edit current record': "Modifier l'enregistrement courant",
 'edit profile': 'modifier le profil',
 'Edit This App': 'Modifier cette application',
-'Email and SMS': 'Email et SMS',
+'Email and SMS': 'Courriel et texto',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
+'Enter an integer between %(min)g and %(max)g': 'Enter an integer between %(min)g and %(max)g',
 'enter an integer between %(min)g and %(max)g': 'entrez un entier entre %(min)g et %(max)g',
 'Errors': 'Erreurs',
 'export as csv file': 'exporter sous forme de fichier csv',
@@ -85,40 +108,61 @@
 'Forms and Validators': 'Formulaires et Validateurs',
 'Free Applications': 'Applications gratuites',
 'Function disabled': 'Fonction désactivée',
-'Graph Model': 'Graph Model',
+'Graph Model': 'Représentation graphique du modèle',
-'Group ID': 'Groupe ID',
+'Grid Example': 'Grid Example',
+'Group %(group_id)s created': '%(group_id)s groupe créé',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'ID du groupe',
+'Group uniquely assigned to user %(id)s': "Groupe unique attribué à l'utilisateur %(id)s",
 'Groups': 'Groupes',
 'Hello World': 'Bonjour le monde',
-'Helping web2py': 'En train d’aider web2py',
+'Helping web2py': 'Aider web2py',
 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
 'Home': 'Accueil',
-'How did you get here?': 'Comment êtes-vous arrivé ici?',
+'How did you get here?': 'How did you get here?',
-'import': 'Importer',
+'import': 'importer',
 'Import/Export': 'Importer/Exporter',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Index': 'Index',
 'insert new': 'insérer un nouveau',
 'insert new %s': 'insérer un nouveau %s',
+'Insufficient privileges': 'Insufficient privileges',
 'Internal State': 'État interne',
-'Introduction': 'Introduction',
+'Introduction': 'Présentation',
-'Invalid email': 'E-mail invalide',
+'Invalid email': 'Courriel invalide',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
+'Invalid password': 'Invalid password',
 'Invalid Query': 'Requête Invalide',
 'invalid request': 'requête invalide',
+'Invalid reset password': 'Invalid reset password',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Is Active': 'Est actif',
 'Key': 'Clé',
+'Key verified': 'Key verified',
 'Last name': 'Nom',
 'Layout': 'Mise en page',
 'Layout Plugins': 'Plugins de mise en page',
 'Layouts': 'Mises en page',
-'Live chat': 'Chat en direct',
+'Live chat': 'Clavardage en direct',
-'Live Chat': 'Chat en direct',
+'Live Chat': 'Clavardage en direct',
-'Log In': 'Log In',
+'Loading...': 'Chargement...',
-'login': 'connectez-vous',
+'loading...': 'chargement...',
-'Login': 'Connectez-vous',
+'Log In': 'Connexion',
-'logout': 'déconnectez-vous',
+'Logged in': 'Connecté',
+'Logged out': 'Logged out',
+'login': 'connexion',
+'Login': 'Connexion',
+'Login disabled by administrator': 'Login disabled by administrator',
+'logout': 'déconnexion',
+'Logout': 'Logout',
 'lost password': 'mot de passe perdu',
 'Lost Password': 'Mot de passe perdu',
 'Lost password?': 'Mot de passe perdu?',
 'lost password?': 'mot de passe perdu?',
+'Lost your password?': 'Lost your password?',
 'Main Menu': 'Menu principal',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
@@ -129,66 +173,87 @@
 'Modified On': 'Modifié le',
 'My Sites': 'Mes sites',
 'Name': 'Nom',
+'New password': 'New password',
 'New Record': 'Nouvel enregistrement',
 'new record inserted': 'nouvel enregistrement inséré',
-'next %s rows': 'next %s rows',
+'next %s rows': '%s prochaine lignes',
 'next 100 rows': '100 prochaines lignes',
 'No databases in this application': "Cette application n'a pas de bases de données",
 'Number of entries: **%s**': 'Number of entries: **%s**',
 'Object or table name': 'Objet ou nom de table',
+'Old password': 'Old password',
 'Online book': 'Online book',
 'Online examples': 'Exemples en ligne',
 'or import from csv file': "ou importer d'un fichier CSV",
 'Origin': 'Origine',
-'Other Plugins': 'Autres Plugins',
+'Other Plugins': 'Autres Plugiciels',
 'Other Recipes': 'Autres recettes',
 'Overview': 'Présentation',
+'password': 'mot de passe',
 'Password': 'Mot de passe',
+'Password changed': 'Password changed',
 "Password fields don't match": 'Les mots de passe ne correspondent pas',
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Permission': 'Permission',
 'Permissions': 'Permissions',
-'Plugins': 'Plugins',
+'please input your password again': "S'il vous plaît entrer votre mot de passe à nouveau",
+'Plugins': 'Plugiciels',
 'Powered by': 'Alimenté par',
 'Preface': 'Préface',
-'previous %s rows': 'previous %s rows',
+'previous %s rows': '%s lignes précédentes',
 'previous 100 rows': '100 lignes précédentes',
+'profile': 'profil',
+'Profile': 'Profile',
+'Profile updated': 'Profile updated',
 'pygraphviz library not found': 'Bibliothèque pygraphviz introuvable',
 'Python': 'Python',
 'Query:': 'Requête:',
 'Quick Examples': 'Exemples Rapides',
 'RAM': 'RAM',
-'RAM Cache Keys': 'Clés de cache de la RAM',
+'RAM Cache Keys': 'RAM Cache Keys',
 'Ram Cleared': 'Ram vidée',
 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Readme': 'Lisez-moi',
 'Recipes': 'Recettes',
 'Record': 'enregistrement',
+'Record %(id)s created': 'Enregistrement %(id)s créé',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Enregistrement %(id)s modifié',
+'Record Created': 'Enregistrement créé',
+'Record Deleted': 'Record Deleted',
 'record does not exist': "l'archive n'existe pas",
-'Record ID': "ID d'enregistrement",
+'Record ID': "ID de l'enregistrement",
-'Record id': "id d'enregistrement",
+'Record id': "id de l'enregistrement",
+'Record Updated': 'Enregistrement modifié',
 'Register': "S'inscrire",
 'register': "s'inscrire",
-'Registration identifier': "Identifiant d'enregistrement",
+'Registration identifier': "Identifiant d'inscription",
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': "Clé d'enregistrement",
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Inscription réussie',
 'Remember me (for 30 days)': 'Se souvenir de moi (pendant 30 jours)',
 'Request reset password': 'Demande de réinitialiser le mot clé',
 'Reset Password key': 'Réinitialiser le mot clé',
 'Resources': 'Ressources',
 'Role': 'Rôle',
-'Roles': 'Roles',
+'Roles': 'Rôles',
 'Rows in Table': 'Lignes du tableau',
 'Rows selected': 'Lignes sélectionnées',
 'Save model as...': 'Enregistrer le modèle sous...',
 'Semantic': 'Sémantique',
 'Services': 'Services',
-'Sign Up': 'Sign Up',
+'Sign Up': "S'inscrire",
-'Size of cache:': 'Taille du cache:',
+'Sign up': 'Sign up',
+'Size of cache:': 'Taille de la mémoire cache:',
 'state': 'état',
 'Statistics': 'Statistiques',
 'Stylesheet': 'Feuille de style',
 'submit': 'soumettre',
 'Submit': 'Soumettre',
-'Support': 'Support',
+'Support': 'Soutien',
 'Sure you want to delete this object?': 'Êtes-vous sûr de vouloir supprimer cet objet?',
 'Table': 'tableau',
 'Table name': 'Nom du tableau',
@@ -197,31 +262,54 @@
 'The output of the file is a dictionary that was rendered by the view %s': 'La sortie de ce fichier est un dictionnaire qui été restitué par la vue %s',
 'The Views': 'Les Vues',
 'This App': 'Cette Appli',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
+'This email already has an account': 'This email already has an account',
 'This is a copy of the scaffolding application': "Ceci est une copie de l'application échafaudage",
 'Time in Cache (h:m:s)': 'Temps en Cache (h:m:s)',
 'Timestamp': 'Horodatage',
 'Traceback': 'Traceback',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'unable to parse csv file': "incapable d'analyser le fichier cvs",
+'Unable to send email': 'Unable to send email',
 'Update:': 'Mise à jour:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Employez (...)&(...) pour AND, (...)|(...) pour OR, and ~(...)  pour NOT afin de construire des requêtes plus complexes.',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
 'User %(id)s Logged-in': 'Utilisateur %(id)s connecté',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
 'User %(id)s Registered': 'Utilisateur %(id)s enregistré',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
 'User ID': 'ID utilisateur',
 'User Voice': "Voix de l'utilisateur",
+'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
 'Verify Password': 'Vérifiez le mot de passe',
 'Videos': 'Vidéos',
 'View': 'Présentation',
 'Web2py': 'Web2py',
 'Welcome': 'Bienvenue',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome %s': 'Bienvenue %s',
 'Welcome to web2py': 'Bienvenue à web2py',
 'Welcome to web2py!': 'Bienvenue à web2py!',
 'Which called the function %s located in the file %s': 'Qui a appelé la fonction %s se trouvant dans le fichier %s',
+'Wiki Example': 'Wiki Example',
 'Working...': 'Working...',
 'You are successfully running web2py': 'Vous exécutez avec succès web2py',
 'You can modify this application and adapt it to your needs': "Vous pouvez modifier cette application et l'adapter à vos besoins",
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You visited the url %s': "Vous avez visité l'URL %s",
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }

applications/welcome/languages/hi.py

@@ -13,7 +13,19 @@
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 '?': '?',
+'@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
+'@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
+'@markmin\x01**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '**not available** (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)': '``**not available**``:red (requires the Python [[Pympler https://pypi.python.org/pypi/Pympler popup]] library)',
+'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
+'@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
+'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
+'A new password was emailed to you': 'A new password was emailed to you',
 'About': 'About',
 'Access Control': 'Access Control',
 'admin': 'admin',
@@ -21,8 +33,11 @@
 'Administrative interface': 'प्रशासनिक इंटरफेस के लिए यहाँ क्लिक करें',
 'Ajax Recipes': 'Ajax Recipes',
 'An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
+'API Example': 'API Example',
 'appadmin is disabled because insecure channel': 'अप आडमिन (appadmin) अक्षम है क्योंकि असुरक्षित चैनल',
+'Apply changes': 'Apply changes',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Authentication code': 'Authentication code',
 'Available Databases and Tables': 'उपलब्ध  डेटाबेस और तालिका',
 'Buy this book': 'Buy this book',
 "Buy web2py's book": "Buy web2py's book",
@@ -34,10 +49,13 @@
 'Cannot be empty': 'खाली नहीं हो सकता',
 'Change Password': 'पासवर्ड बदलें',
 'change password': 'change password',
+'Change password': 'Change password',
 'Check to delete': 'हटाने के लिए चुनें',
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
+'Client IP': 'Client IP',
 'Community': 'Community',
 'Components and Plugins': 'Components and Plugins',
 'Config.ini': 'Config.ini',
@@ -56,6 +74,7 @@
 'Delete:': 'मिटाना:',
 'Demo': 'Demo',
 'Deployment Recipes': 'Deployment Recipes',
+'Description': 'Description',
 'design': 'रचना करें',
 'Design': 'Design',
 'DISK': 'DISK',
@@ -66,18 +85,29 @@
 "Don't know what to do?": "Don't know what to do?",
 'done!': 'हो गया!',
 'Download': 'Download',
+'E-mail': 'E-mail',
 'Edit': 'Edit',
 'Edit current record': 'वर्तमान रेकॉर्ड संपादित करें ',
 'edit profile': 'edit profile',
 'Edit Profile': 'प्रोफ़ाइल संपादित करें',
 'Edit This App': 'Edit This App',
 'Email and SMS': 'Email and SMS',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Errors': 'Errors',
 'export as csv file': 'csv फ़ाइल के रूप में निर्यात',
 'FAQ': 'FAQ',
+'First name': 'First name',
 'Forms and Validators': 'Forms and Validators',
 'Free Applications': 'Free Applications',
+'Function disabled': 'Function disabled',
 'Graph Model': 'Graph Model',
+'Grid Example': 'Grid Example',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Groups': 'Groups',
 'Hello from MyApp': 'Hello from MyApp',
 'Hello World': 'Hello World',
@@ -87,24 +117,40 @@
 'How did you get here?': 'How did you get here?',
 'import': 'import',
 'Import/Export': 'आयात / निर्यात',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Index': 'Index',
 'insert new': 'नया डालें',
 'insert new %s': 'नया   %s  डालें',
+'Insufficient privileges': 'Insufficient privileges',
 'Internal State': 'आंतरिक  स्थिति',
 'Introduction': 'Introduction',
+'Invalid email': 'Invalid email',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
+'Invalid password': 'Invalid password',
 'Invalid Query': 'अमान्य  प्रश्न',
 'invalid request': 'अवैध अनुरोध',
+'Invalid reset password': 'Invalid reset password',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Key',
+'Key verified': 'Key verified',
+'Last name': 'Last name',
 'Layout': 'Layout',
 'Layout Plugins': 'Layout Plugins',
 'Layouts': 'Layouts',
 'Live Chat': 'Live Chat',
 'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'login': 'login',
 'Login': 'लॉग इन',
+'Login disabled by administrator': 'Login disabled by administrator',
 'logout': 'logout',
 'Logout': 'लॉग आउट',
 'Lost Password': 'पासवर्ड खो गया',
+'Lost your password?': 'Lost your password?',
 'Main Menu': 'Main Menu',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
@@ -112,25 +158,38 @@
 'Memberships': 'Memberships',
 'Menu Model': 'Menu Model',
 'My Sites': 'My Sites',
+'Name': 'Name',
+'New password': 'New password',
 'New Record': 'नया रेकॉर्ड',
 'new record inserted': 'नया रेकॉर्ड डाला',
 'next %s rows': 'next %s rows',
 'next 100 rows': 'अगले 100 पंक्तियाँ',
 'No databases in this application': 'इस  अनुप्रयोग में कोई डेटाबेस नहीं हैं',
 'Number of entries: **%s**': 'Number of entries: **%s**',
+'Object or table name': 'Object or table name',
+'Old password': 'Old password',
 'Online book': 'Online book',
 'Online examples': 'ऑनलाइन उदाहरण के लिए यहाँ क्लिक करें',
 'or import from csv file': 'या  csv फ़ाइल से आयात',
+'Origin': 'Origin',
 'Other Plugins': 'Other Plugins',
 'Other Recipes': 'Other Recipes',
 'Overview': 'Overview',
+'Password': 'Password',
+'Password changed': 'Password changed',
+"Password fields don't match": "Password fields don't match",
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Permission': 'Permission',
 'Permissions': 'Permissions',
+'please input your password again': 'please input your password again',
 'Plugins': 'Plugins',
 'Powered by': 'Powered by',
 'Preface': 'Preface',
 'previous %s rows': 'previous %s rows',
 'previous 100 rows': 'पिछले 100 पंक्तियाँ',
+'Profile': 'Profile',
+'Profile updated': 'Profile updated',
 'pygraphviz library not found': 'pygraphviz library not found',
 'Python': 'Python',
 'Query:': 'प्रश्न:',
@@ -141,10 +200,26 @@
 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Recipes': 'Recipes',
 'Record': 'Record',
+'Record %(id)s created': 'Record %(id)s created',
+'Record %(id)s deleted': 'Record %(id)s deleted',
+'Record %(id)s read': 'Record %(id)s read',
+'Record %(id)s updated': 'Record %(id)s updated',
+'Record Created': 'Record Created',
+'Record Deleted': 'Record Deleted',
 'record does not exist': 'रिकॉर्ड मौजूद नहीं है',
 'Record id': 'रिकॉर्ड पहचानकर्ता (आईडी)',
+'Record ID': 'Record ID',
+'Record Updated': 'Record Updated',
 'Register': 'पंजीकृत (रजिस्टर) करना ',
 'register': 'register',
+'Registration identifier': 'Registration identifier',
+'Registration is pending approval': 'Registration is pending approval',
+'Registration key': 'Registration key',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
+'Request reset password': 'Request reset password',
+'Reset Password key': 'Reset Password key',
 'Role': 'Role',
 'Roles': 'Roles',
 'Rows in Table': 'तालिका में पंक्तियाँ ',
@@ -153,11 +228,13 @@
 'Semantic': 'Semantic',
 'Services': 'Services',
 'Sign Up': 'Sign Up',
+'Sign up': 'Sign up',
 'Size of cache:': 'Size of cache:',
 'state': 'स्थिति',
 'Statistics': 'Statistics',
 'Stylesheet': 'Stylesheet',
 'submit': 'submit',
+'Submit': 'Submit',
 'Support': 'Support',
 'Sure you want to delete this object?': 'सुनिश्चित हैं कि आप इस वस्तु को हटाना चाहते हैं?',
 'Table': 'तालिका',
@@ -166,22 +243,50 @@
 'The output of the file is a dictionary that was rendered by the view %s': 'The output of the file is a dictionary that was rendered by the view %s',
 'The Views': 'The Views',
 'This App': 'This App',
+'This code was emailed to you and is required for login.': 'This code was emailed to you and is required for login.',
+'This email already has an account': 'This email already has an account',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Timestamp': 'Timestamp',
 'Traceback': 'Traceback',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'unable to parse csv file': 'csv फ़ाइल पार्स करने में असमर्थ',
+'Unable to send email': 'Unable to send email',
 'Update:': 'अद्यतन करना:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
 'User': 'User',
+'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
+'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
+'User %(id)s Password changed': 'User %(id)s Password changed',
+'User %(id)s Password reset': 'User %(id)s Password reset',
+'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
+'User %(id)s Profile updated': 'User %(id)s Profile updated',
+'User %(id)s Registered': 'User %(id)s Registered',
+'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
+'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
+'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User ID': 'User ID',
+'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
 'Users': 'Users',
+'Verify Password': 'Verify Password',
 'Videos': 'Videos',
 'View': 'View',
+'Welcome %(username)s! Click on the link %(link)s to verify your email': 'Welcome %(username)s! Click on the link %(link)s to verify your email',
 'Welcome %s': 'Welcome %s',
 'Welcome to web2py': 'वेब२पाइ (web2py)  में आपका स्वागत है',
 'Welcome to web2py!': 'Welcome to web2py!',
 'Which called the function %s located in the file %s': 'Which called the function %s located in the file %s',
+'Wiki Example': 'Wiki Example',
 'Working...': 'Working...',
 'You are successfully running web2py': 'You are successfully running web2py',
 'You can modify this application and adapt it to your needs': 'You can modify this application and adapt it to your needs',
+'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You visited the url %s': 'You visited the url %s',
+'Your password is: %(password)s': 'Your password is: %(password)s',
+'Your temporary login code is {0}': 'Your temporary login code is {0}',
+'Your username is: %(username)s': 'Your username is: %(username)s',
+'Your username was emailed to you': 'Your username was emailed to you',
 }