fix wrong branch signature.

fix: typo

.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,22 @@
 language: python
 
 sudo: required
-
 cache: pip
+dist: "bionic"
+
+services:
+  - mysql
+  - redis-server
 
 python:
   - '2.7'
-  - 'pypy'
-  - '3.5'
+  - '3.6'
+  - '3.7'
+  - 'pypy3.5'
+
+matrix:
+  allow_failures:
+    - python: 'pypy3.5'
 
 install:
   - pip install -e .
@@ -15,11 +24,10 @@ 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
+  - pip install redis
 
+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 +37,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
-- web2py does not support python 2.6 anymore
-- py3.5 syntax compatible (see #1353 for details)
-- dropped web shell from admin
+OLD NAME                   NEW NAME
+==================         ==================
+--debug                     --log_level
+--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 '*.orig' -exec rm -f {} \; 
-	find ./ -name '*.rej' -exec rm -f {} \; 
-	find ./ -name '#*' -exec rm -f {} \;
-	find ./ -name 'Thumbs.db' -exec rm -f {} \; 
-	# find ./gluon/ -name '.*' -exec rm -f {} \;
-	find ./gluon/ -name '*class' -exec rm -f {} \; 
-	find ./applications/admin/ -name '.*' -exec rm -f {} \; 
-	find ./applications/examples/ -name '.*' -exec rm -f {} \; 
-	find ./applications/welcome/ -name '.*' -exec rm -f {} \; 
-	find ./ -name '*.pyc' -exec rm -f {} \;
+	find . -name '*~' -exec rm -f {} \; 
+	find . -name '*.orig' -exec rm -f {} \; 
+	find . -name '*.rej' -exec rm -f {} \; 
+	find . -name '#*' -exec rm -f {} \;
+	find . -name 'Thumbs.db' -exec rm -f {} \; 
+	# find . -name '.tox' -exec rm -rf {} \; 
+	# find . -name '__pycache__' -exec rm -rf {} \; 
+	find gluon/ -name '*class' -exec rm -f {} \; 
+	find applications/admin/ -name '.*' -exec rm -f {} \; 
+	find applications/examples/ -name '.*' -exec rm -f {} \; 
+	find applications/welcome/ -name '.*' -exec rm -f {} \; 
+	find . -name '*.pyc' -exec rm -f {} \;
 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:
-	### 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
+rmfiles:
 	### 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
-        server = wsgiserver.CherryPyWSGIServer(address, app)
+        from cheroot.wsgi import Server as WSGIServer
+        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...' % (
-        options.server, options.ip, options.port)
+    print('starting %s on %s:%s...' % (
+        options.server, options.ip, options.port))
     run(options.server, options.ip, options.port,
         logging=options.logging, profiler=options.profiler_dir,
         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",
-                     "sender", "subject")]
+                    ('id', 'uid', 'created', 'to',
+                     '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
-        hp = hpy()
+        from pympler.asizeof import asizeof
     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:
-                ram['bytes'] += hp.iso(value[1]).size
-                ram['objects'] += hp.iso(value[1]).count
+            if asizeof:
+                ram['bytes'] += asizeof(value[1])
+                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:
-                    disk['bytes'] += hp.iso(value[1]).size
-                    disk['objects'] += hp.iso(value[1]).count
+                if asizeof:
+                    disk['bytes'] += asizeof(value[1])
+                    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"
-    bgcolor = "#FFFFFF"
-    face = "Helvetica"
-    face_bold = "Helvetica Bold"
+    color = '#000000'
+    bgcolor = '#FFFFFF'
+    face = 'Helvetica'
+    face_bold = 'Helvetica Bold'
     border = 0
 
     rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor),
                            _colspan=3, _cellpadding=cellpadding,
-                           _align="center", _bgcolor=color)))
+                           _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']]
-    tables=[]
-    with_build_it=False
+    list_op = ['_%s_%s' %(h,m) for h in ['before', 'after'] for m in ['insert','update','delete']]
+    tables = []
+    with_build_it = False
     for db_str in sorted(databases):
         db = databases[db_str]
         for t in db.tables:
-            method_hooks=[]
+            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(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(LI(op['name']))
+            ul_t.append(UL([LI(A(f['funcname'], _class='editor_filelink', _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main
+
+
+# ##########################################################
+# d3 based model visualizations
+# ###########################################################
+
+def d3_graph_model():
+    ''' See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
+    and also the app_admin bg_graph_model function
+
+    Create a list of table dicts, called 'nodes'
+    '''
+
+    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)
-        functions = functions and sorted(functions) or []
+        try:
+            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(
-        unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower()))
+    keys = sorted(strings.keys(), key=lambda x: to_native(x).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)
-        functions[c] = items and sorted(items) or []
+        try:
+            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)
-        functions[c] = items and sorted(items) or []
+        try:
+            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

@@ -11,12 +11,27 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access)': '(vereis internet toegang)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(iets soos "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\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 +60,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 +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',
@@ -85,6 +102,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 +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',
@@ -152,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',
@@ -178,6 +199,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 +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',
@@ -225,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,8 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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 +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': '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 +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': 'tale',
 'Languages': 'Tale',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Last saved on:',
 'License for': 'Lisensie vir',
@@ -294,11 +337,14 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'laai...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'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 +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': '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 +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',
@@ -348,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': 'skryf oor geinstalleerde program',
@@ -355,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.',
@@ -363,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',
@@ -378,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.',
@@ -393,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',
@@ -441,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:',
@@ -454,17 +529,16 @@
 'Start searching': 'Start searching',
 'Start wizard': 'start wizard',
 'state': 'state',
-'Static': 'Static',
 'static': 'static',
+'Static': 'Static',
 'Static files': 'Static files',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'submit': 'submit',
 'Submit': 'Submit',
+'submit': 'submit',
 'successful': 'successful',
-'Sure you want to delete this object?': 'Is jy seker jy will hierde object verwyder?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
@@ -490,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': '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 +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]': '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 +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',
@@ -527,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',
@@ -539,21 +618,33 @@
 'upgrade now to %s': 'upgrade now to %s',
 'upload': 'oplaai',
 'Upload': 'Upload',
-'Upload & install packed application': 'Oplaai & install gepakte program',
 'Upload a package:': 'Oplaai n package:',
 'Upload and install packed application': 'Upload and install packed application',
 'upload file:': 'oplaai lêer:',
 'upload plugin file:': 'upload plugin lêer:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
-'Use an url:': 'Gebruik n url:',
 'User': 'User',
+'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',
 'Views': 'Views',
 'views': 'views',
 'Warning!': 'Warning!',
@@ -566,17 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py is up to date',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'web2py Onlangse Tweets',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'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

@@ -11,20 +11,32 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access)': '(requires internet access)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(something like "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\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',
-'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',
+'@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',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': 'additional code for your application',
 'Additional code for your application': 'Additional code for your application',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'admin disabled because no admin password',
@@ -32,12 +44,10 @@
 'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'admin disabled because unable to access password file',
 'Admin is disabled because insecure channel': 'Admin is disabled because insecure channel',
-'Admin is disabled because unsecure channel': 'Admin is disabled because unsecure channel',
 'Admin language': 'Admin language',
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'administrative interface',
 'Administrator Password:': 'Administrator Password:',
-'and rename it (required):': 'and rename it (required):',
 'and rename it:': 'and rename it:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
@@ -50,14 +60,13 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
-'Are you sure you want to uninstall application "%s"': 'Are you sure you want to uninstall application "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Are you sure you want to uninstall application "%s"?',
-'Are you sure you want to upgrade web2py now?': 'Are you sure you want to upgrade web2py now?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'arguments',
 'at char %s': 'at char %s',
@@ -66,8 +75,8 @@
 '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',
 'back': 'back',
 'Back to the plugins list': 'Back to the plugins list',
@@ -87,13 +96,13 @@
 'can be a git repo': 'can be a git repo',
 'Cancel': 'Cancel',
 'Cannot be empty': 'Cannot be empty',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.',
 'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
 'cannot create file': 'cannot create file',
 'cannot upload file "%(filename)s"': 'cannot upload file "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'check all',
 'Check for upgrades': 'check for upgrades',
@@ -104,11 +113,10 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 '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',
@@ -128,8 +136,6 @@
 'Count': 'Count',
 'Create': 'create',
 'create file with filename:': 'create file with filename:',
-'create new application:': 'create new application:',
-'Create new simple application': 'Create new simple application',
 'Create/Upload': 'Create/Upload',
 'created by': 'created by',
 'Created by:': 'Created by:',
@@ -143,9 +149,7 @@
 'currently saved or': 'currently saved or',
 'data uploaded': 'данните бяха качени',
 'Database': 'Database',
-'database': 'database',
 'Database %s select': 'Database %s select',
-'database %s select': 'database %s select',
 'Database administration': 'Database administration',
 'database administration': 'database administration',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
@@ -168,10 +172,9 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'дизайн',
-'DESIGN': 'DESIGN',
-'Design for': 'Design for',
 'Detailed traceback description': 'Detailed traceback description',
 'details': 'details',
 'direction: ltr': 'direction: ltr',
@@ -196,25 +199,24 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
-'EDIT': 'EDIT',
+'E-mail': 'E-mail',
 'Edit': 'edit',
 'edit all': 'edit all',
 'Edit application': 'Edit application',
-'edit controller': 'edit controller',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Edit current record',
 'edit views:': 'edit views:',
 'Editing %s': 'Editing %s',
-'Editing file': 'Editing file',
-'Editing file "%s"': 'Editing file "%s"',
 'Editing Language file': 'Editing Language file',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Error logs for "%(app)s"',
 'Error snapshot': 'Error snapshot',
@@ -231,13 +233,11 @@
 'exposes:': 'exposes:',
 'extends': 'extends',
 'failed to compile file because:': 'failed to compile file because:',
-'failed to reload module': 'failed to reload module',
 'failed to reload module because:': 'failed to reload module because:',
 'File': 'File',
 'file "%(filename)s" created': 'file "%(filename)s" created',
 'file "%(filename)s" deleted': 'file "%(filename)s" deleted',
 'file "%(filename)s" uploaded': 'file "%(filename)s" uploaded',
-'file "%(filename)s" was not deleted': 'file "%(filename)s" was not deleted',
 'file "%s" of %s restored': 'file "%s" of %s restored',
 'file changed on disk': 'file changed on disk',
 'file does not exist': 'file does not exist',
@@ -250,14 +250,15 @@
 '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',
 'GAE Password': 'GAE Password',
 'Generate': 'Generate',
-'Get from URL:': 'Get from URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
@@ -265,9 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
-'Hello World': 'Здравей, свят',
+'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',
@@ -275,7 +279,6 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'htmledit',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -285,13 +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',
-'insert new': 'insert new',
-'insert new %s': 'insert new %s',
 'inspect attributes': 'inspect attributes',
 'Install': 'install',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Installed applications',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'internal error',
@@ -300,22 +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 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',
-'languages updated': 'languages updated',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Last saved on:',
 'License for': 'License for',
@@ -325,12 +337,14 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'loading...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'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 +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',
@@ -362,7 +378,6 @@
 'New simple application': 'New simple application',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'next 100 rows',
 'NO': 'NO',
 'no changes': 'no changes',
 'No databases in this application': 'No databases in this application',
@@ -374,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',
@@ -381,8 +398,7 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'or import from csv file',
-'or provide app url:': 'or provide app url:',
-'or provide application url:': 'or provide application url:',
+'Origin': 'Origin',
 'Original/Translation': 'Original/Translation',
 'Overview': 'Overview',
 'Overwrite installed app': 'overwrite installed app',
@@ -390,8 +406,12 @@
 'Pack compiled': 'pack compiled',
 'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
-'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
+'Password': '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 +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',
@@ -412,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': 'previous 100 rows',
 'Private files': 'Private files',
 'private files': 'private files',
+'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,21 +451,35 @@
 'Ram Cleared': 'Ram Cleared',
 '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',
@@ -457,7 +492,6 @@
 'Revision:': 'Revision:',
 'Role': 'Role',
 'Roles': 'Roles',
-'Rows in table': 'Rows in table',
 'Rows in Table': 'Rows in Table',
 'Rows selected': 'Rows selected',
 'rules are not defined': 'rules are not defined',
@@ -466,7 +500,6 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
 'Save': 'Save',
-'save': 'save',
 'Save file:': 'Save file:',
 'Save file: %s': 'Save file: %s',
 'Save model as...': 'Save model as...',
@@ -475,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'selected',
 'session': 'session',
 'session expired': 'session expired',
 'Session saved correctly': 'Session saved correctly',
@@ -483,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:',
@@ -496,21 +529,19 @@
 'Start searching': 'Start searching',
 'Start wizard': 'start wizard',
 'state': 'състояние',
-'Static': 'Static',
 'static': 'static',
+'Static': 'Static',
 'Static files': 'Static files',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'submit': 'submit',
 'Submit': 'Submit',
+'submit': 'submit',
 'successful': 'successful',
-'Sure you want to delete this object?': 'Сигурен ли си, че искаш да изтриеш този обект?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'table',
 'Table': 'Table',
 'Temporary': 'Temporary',
 'test': 'test',
@@ -518,12 +549,9 @@
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'the application logic, each URL path is mapped in one exposed function in the controller',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'the data representation, define database tables and sets': 'the data representation, define database tables and sets',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'the presentations layer, views are also known as templates': 'the presentations layer, views are also known as templates',
 'Theme': 'Theme',
 'There are no controllers': 'There are no controllers',
 'There are no models': 'There are no models',
@@ -536,11 +564,11 @@
 'There are no views': 'There are no views',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'these files are served without processing, your images go here': 'these files are served without processing, your images go here',
+'This 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',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
@@ -550,7 +578,7 @@
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
-'TM': 'TM',
+'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:',
@@ -559,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
-'translation strings for the application': 'translation strings for the application',
 'Translation strings for the application': 'Translation strings for the application',
-'try': 'try',
 'try something like': 'try something like',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'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',
@@ -572,14 +599,13 @@
 'unable to delete file "%(filename)s"': 'unable to delete file "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': 'Unable to download',
 'Unable to download app because:': 'Unable to download app because:',
-'Unable to download because': 'Unable to download because',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'не е възможна обработката на csv файла',
+'Unable to 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',
@@ -590,27 +616,35 @@
 'Update:': 'Update:',
 'Upgrade': 'Upgrade',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'upgrade web2py now',
 'upload': 'upload',
 'Upload': 'Upload',
-'Upload & install packed application': 'Upload & install packed application',
 'Upload a package:': 'Upload a package:',
 'Upload and install packed application': 'Upload and install packed application',
-'upload application:': 'upload application:',
-'Upload existing application': 'Upload existing application',
 'upload file:': 'upload file:',
 'upload plugin file:': 'upload plugin file:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
-'Use an url:': 'Use an url:',
 'User': 'User',
+'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',
-'view': 'view',
 'Views': 'Views',
 'views': 'views',
 'Warning!': 'Warning!',
@@ -623,18 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py is up to date',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'web2py Recent Tweets',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
-'Welcome to web2py': 'Добре дошъл в web2py',
+'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/cs.py

@@ -4,9 +4,6 @@
 '!langname!': 'čeština',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': 'Kolonka "Upravit" je nepovinný výraz, například "pole1=\'nováhodnota\'". Výsledky databázového JOINu nemůžete mazat ani upravovat.',
 '"User Exception" debug mode. ': '"User Exception" debug mode. ',
-'"User Exception" debug mode. An error ticket could be issued!': '"User Exception" debug mode. An error ticket could be issued!',
-'%%{Row} in Table': '%%{řádek} v tabulce',
-'%%{Row} selected': 'označených %%{řádek}',
 '%s': '%s',
 '%s %%{row} deleted': '%s smazaných %%{záznam}',
 '%s %%{row} updated': '%s upravených %%{záznam}',
@@ -14,18 +11,31 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%d.%m.%Y',
 '%Y-%m-%d %H:%M:%S': '%d.%m.%Y %H:%M:%S',
-'(requires internet access)': '(vyžaduje připojení k internetu)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(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',
 'Accept Terms': 'Accept Terms',
-'Access Control': 'Řízení přístupu',
 'Add breakpoint': 'Přidat bod přerušení',
 'Additional code for your application': 'Další kód pro Vaši aplikaci',
 'Admin design page': 'Admin design page',
@@ -36,12 +46,8 @@
 'Admin is disabled because insecure channel': 'Admin is disabled because insecure channel',
 'Admin language': 'jazyk rozhraní',
 'Admin versioning page': 'Admin versioning page',
-'Administrative interface': 'pro administrátorské rozhraní klikněte sem',
-'Administrative Interface': 'Administrátorské rozhraní',
 'administrative interface': 'rozhraní pro správu',
 'Administrator Password:': 'Administrátorské heslo:',
-'Ajax Recipes': 'Recepty s ajaxem',
-'An error occured, please %s the page': 'An error occured, please %s the page',
 'and rename it:': 'a přejmenovat na:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
@@ -54,6 +60,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 +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': 'Dostupné databáze a tabulky',
 'back': 'zpět',
@@ -80,7 +88,6 @@
 'breakpoints': 'body přerušení',
 'Bulk Register': 'Bulk Register',
 'Bulk Student Registration': 'Bulk Student Registration',
-'Buy this book': 'Koupit web2py knihu',
 'Cache': 'Cache',
 'cache': 'cache',
 'Cache Cleared': 'Cache Cleared',
@@ -100,13 +107,13 @@
 'check all': 'vše označit',
 'Check for upgrades': 'Zkusit aktualizovat',
 'Check to delete': 'Označit ke smazání',
-'Check to delete:': 'Označit ke smazání:',
 'Checking for upgrades...': 'Zjišťuji, zda jsou k dispozici aktualizace...',
 'Clean': 'Pročistit',
 'Clear': 'Clear',
 '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',
@@ -118,24 +125,19 @@
 'Commit': 'Commit',
 'Commit form': 'Commit form',
 'Committed files': 'Committed files',
-'Community': 'Komunita',
 'Compile': 'Zkompilovat',
 'Compile (all or nothing)': 'Compile (all or nothing)',
 'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'zkompilovaná aplikace smazána',
-'Components and Plugins': 'Komponenty a zásuvné moduly',
 'Condition': 'Podmínka',
 'continue': 'continue',
-'Controller': 'Kontrolér (Controller)',
 'Controllers': 'Kontroléry',
 'controllers': 'kontroléry',
-'Copyright': 'Copyright',
 'Count': 'Počet',
 'Create': 'Vytvořit',
 'create file with filename:': 'vytvořit soubor s názvem:',
 'Create/Upload': 'Create/Upload',
 'created by': 'vytvořil',
-'Created By': 'Vytvořeno - kým',
 'Created by:': 'Created by:',
 'Created On': 'Vytvořeno - kdy',
 'Created on:': 'Created on:',
@@ -145,7 +147,6 @@
 'Current session': 'Aktuální relace',
 'currently running': 'právě běží',
 'currently saved or': 'uloženo nebo',
-'customize me!': 'upravte mě!',
 'data uploaded': 'data nahrána',
 'Database': 'Rozhraní databáze',
 'Database %s select': 'databáze %s výběr',
@@ -153,9 +154,7 @@
 'database administration': 'správa databáze',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Datum a čas',
-'day': 'den',
 'db': 'db',
-'DB Model': 'Databázový model',
 'Debug': 'Ladění',
 'defines tables': 'defines tables',
 'Delete': 'Smazat',
@@ -173,7 +172,6 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
-'Deployment Recipes': 'Postupy pro deployment',
 'Description': 'Popis',
 'Description:': 'Description:',
 'design': 'návrh',
@@ -193,11 +191,8 @@
 'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'dokumentace',
 'Docs': 'Docs',
-'Documentation': 'Dokumentace',
-"Don't know what to do?": 'Nevíte kudy kam?',
 'done!': 'hotovo!',
 'Downgrade': 'Downgrade',
-'Download': 'Stáhnout',
 'Download .w2p': 'Download .w2p',
 'Download as .exe': 'Download as .exe',
 'download layouts': 'stáhnout moduly rozvržení stránky',
@@ -208,23 +203,20 @@
 'Edit': 'Upravit',
 'edit all': 'edit all',
 'Edit application': 'Správa aplikace',
-'edit controller': 'edit controller',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Upravit aktuální záznam',
-'Edit Profile': 'Upravit profil',
 'edit views:': 'upravit pohled:',
 'Editing %s': 'Editing %s',
-'Editing file "%s"': 'Úprava souboru "%s"',
 'Editing Language file': 'Úprava jazykového souboru',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 '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',
-'enter a number between %(min)g and %(max)g': 'zadejte číslo mezi %(min)g a %(max)g',
-'enter an integer between %(min)g and %(max)g': 'zadejte celé číslo mezi %(min)g a %(max)g',
 'Error': 'Chyba',
 'Error logs for "%(app)s"': 'Seznam výskytu chyb pro aplikaci "%(app)s"',
 'Error snapshot': 'Snapshot chyby',
@@ -234,7 +226,6 @@
 'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Prvky instance výjimky',
 'Exit Fullscreen': 'Exit Fullscreen',
-'Expand Abbreviation': 'Expand Abbreviation',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'exportovat do .csv souboru',
 'Exports:': 'Exports:',
@@ -243,9 +234,7 @@
 'extends': 'rozšiřuje',
 'failed to compile file because:': 'soubor se nepodařilo zkompilovat, protože:',
 'failed to reload module because:': 'failed to reload module because:',
-'FAQ': 'Často kladené dotazy',
 'File': 'Soubor',
-'file': 'soubor',
 'file "%(filename)s" created': 'file "%(filename)s" created',
 'file "%(filename)s" deleted': 'file "%(filename)s" deleted',
 'file "%(filename)s" uploaded': 'file "%(filename)s" uploaded',
@@ -262,18 +251,14 @@
 'Find Next': 'Najít další',
 'Find Previous': 'Najít předchozí',
 'First name': 'Křestní jméno',
-'Forgot username?': 'Zapomněl jste svoje přihlašovací jméno?',
-'forgot username?': 'zapomněl jste svoje přihlašovací jméno?',
 'Form has errors': 'Form has errors',
-'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',
 'GAE Password': 'GAE Password',
 'Generate': 'Vytvořit',
-'Get from URL:': 'Stáhnout z internetu:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globální proměnné',
@@ -281,12 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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',
-'Groups': 'Skupiny',
-'Hello World': 'Ahoj světe',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'Nápověda',
 'here': 'here',
 'Hide/Show Translated strings': 'Skrýt/Zobrazit přeložené texty',
@@ -294,7 +279,6 @@
 'Hits': 'Kolikrát dosaženo',
 'Home': 'Domovská stránka',
 'honored only if the expression evaluates to true': 'brát v potaz jen když se tato podmínka vyhodnotí kladně',
-'How did you get here?': 'Jak jste se sem vlastně dostal?',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -304,38 +288,39 @@
 '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 ',
-'insert new %s': 'vložit nový záznam %s',
 'inspect attributes': 'inspect attributes',
 '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',
 'internal error: %s': 'internal error: %s',
 'Internal State': 'Vnitřní stav',
-'Introduction': 'Úvod',
 'Invalid action': 'Invalid action',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'Neplatný email',
 'Invalid git repository specified.': 'Invalid git repository specified.',
-'Invalid password': 'Nesprávné heslo',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Invalid login',
 'invalid password': 'invalid password',
+'Invalid password': 'Nesprávné heslo',
 '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',
-'Is Active': 'Je aktivní',
-'It is %s %%{day} today.': 'Dnes je to %s %%{den}.',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 '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',
@@ -345,35 +330,26 @@
 'Last name': 'Příjmení',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Naposledy uloženo:',
-'Layout': 'Rozvržení stránky (layout)',
-'Layout Plugins': 'Moduly rozvržení stránky (Layout Plugins)',
-'Layouts': 'Rozvržení stránek',
 'License for': 'Licence pro',
 'License:': 'License:',
 'Line Nr': 'Line Nr',
 'Line number': 'Číslo řádku',
-'LineNo': 'Č.řádku',
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
-'Live Chat': 'Online pokec',
 'Loading...': 'Loading...',
-'loading...': 'nahrávám...',
 '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',
-'logout': 'odhlásit se',
 'Logout': 'Odhlásit se',
 'lost password': 'lost password',
-'Lost Password': 'Zapomněl jste heslo',
-'Lost password?': 'Zapomněl jste heslo?',
-'lost password?': 'zapomněl jste heslo?',
 'Main Menu': 'Main Menu',
 'Manage': 'Manage',
 'Manage %(action)s': 'Manage %(action)s',
@@ -382,16 +358,13 @@
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Manage Students',
 'Memberships': 'Memberships',
-'Menu Model': 'Model rozbalovací nabídky',
 'merge': 'merge',
 'Models': 'Modely',
 'models': 'modely',
-'Modified By': 'Změněno - kým',
 'Modified On': 'Změněno - kdy',
 'Modules': 'Moduly',
 'modules': 'moduly',
 'Multi User Mode': 'Multi User Mode',
-'My Sites': 'Správa aplikací',
 'Name': 'Jméno',
 'new application "%s" created': 'nová aplikace "%s" vytvořena',
 'new application "%s" imported': 'new application "%s" imported',
@@ -405,7 +378,6 @@
 'New simple application': 'Vytvořit primitivní aplikaci',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'dalších 100 řádků',
 'NO': 'NO',
 'no changes': 'no changes',
 'No databases in this application': 'V této aplikaci nejsou žádné databáze',
@@ -413,7 +385,6 @@
 'no match': 'no match',
 'no package selected': 'no package selected',
 'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
-'No ticket_storage.txt found under /private folder': 'Soubor ticket_storage.txt v adresáři /private nenalezen',
 'Node:': 'Node:',
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
@@ -421,8 +392,6 @@
 'Object or table name': 'Objekt či tabulka',
 'Old password': 'Původní heslo',
 "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 návrhář',
-'Online examples': 'Příklady online',
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
 'OpenShift Output': 'OpenShift Output',
@@ -431,8 +400,6 @@
 'or import from csv file': 'nebo importovat z .csv souboru',
 'Origin': 'Původ',
 'Original/Translation': 'Originál/Překlad',
-'Other Plugins': 'Ostatní moduly',
-'Other Recipes': 'Ostatní zásuvné moduly',
 'Overview': 'Přehled',
 'Overwrite installed app': 'Přepsat instalovanou aplikaci',
 'Pack all': 'Zabalit',
@@ -440,9 +407,11 @@
 'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
 '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 +419,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',
@@ -460,14 +430,12 @@
 'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Množná čísla:',
 'Powered by': 'Poháněno',
-'Preface': 'Předmluva',
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': 'předchozích 100 řádků',
 '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.',
@@ -475,27 +443,31 @@
 'Push': 'Push',
 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
 'pygraphviz library not found': 'pygraphviz library not found',
-'Python': 'Python',
 'PythonAnywhere Apps': 'PythonAnywhere Apps',
 'PythonAnywhere Password': 'PythonAnywhere Password',
 'Query:': 'Dotaz:',
-'Quick Examples': 'Krátké příklady',
 'RAM': 'RAM',
 'RAM Cache Keys': 'Klíče RAM Cache',
 'Ram Cleared': 'RAM smazána',
 'Rapid Search': 'Rapid Search',
-'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 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íč',
-'reload': 'reload',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Znovu nahrát cesty',
 'Remember me (for 30 days)': 'Zapamatovat na 30 dní',
 'Remove compiled': 'Odstranit zkompilované',
@@ -504,6 +476,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',
@@ -511,7 +484,6 @@
 'response': 'response',
 'restart': 'restart',
 'restore': 'obnovit',
-'Retrieve username': 'Získat přihlašovací jméno',
 'return': 'return',
 'Revert': 'Revert',
 'revert': 'vrátit se k původnímu',
@@ -536,8 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'Semantic': 'Modul semantic',
-'Services': 'Služby',
 'session': 'session',
 'session expired': 'session expired',
 'Session saved correctly': 'Session saved correctly',
@@ -545,6 +515,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:',
@@ -558,24 +529,20 @@
 'Start searching': 'Začít hledání',
 'Start wizard': 'Spustit průvodce',
 'state': 'stav',
-'Static': 'Static',
 'static': 'statické soubory',
+'Static': 'Static',
 'Static files': 'Statické soubory',
 'Statistics': 'Statistika',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'Stylesheet': 'CSS styly',
-'submit': 'odeslat',
 'Submit': 'Odeslat',
+'submit': 'odeslat',
 'successful': 'úspěšně',
-'Support': 'Podpora',
-'Sure you want to delete this object?': 'Opravdu chcete smazat tento objekt?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
 'Table': 'tabulka',
-'Table name': 'Název tabulky',
 'Temporary': 'Dočasný',
 'test': 'test',
 'Testing application': 'Testing application',
@@ -583,11 +550,8 @@
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika aplikace: každá URL je mapována na funkci vystavovanou kontrolérem.',
-'The Core': 'Jádro (The Core)',
 'The data representation, define database tables and sets': 'Reprezentace dat: definovat tabulky databáze a záznamy',
-'The output of the file is a dictionary that was rendered by the view %s': 'Výstup ze souboru je slovník, který se zobrazil v pohledu %s.',
 'The presentations layer, views are also known as templates': 'Prezentační vrstva: pohledy či templaty (šablony)',
-'The Views': 'Pohledy (The Views)',
 'Theme': 'Theme',
 'There are no controllers': 'There are no controllers',
 'There are no models': 'There are no models',
@@ -600,12 +564,11 @@
 'There are no views': 'There are no views',
 'These files are not served, they are only available from within your app': 'Tyto soubory jsou klientům nepřístupné. K dispozici jsou pouze v rámci aplikace.',
 'These files are served without processing, your images go here': 'Tyto soubory jsou servírovány bez přídavné logiky, sem patří např. obrázky.',
-'This App': 'Tato aplikace',
+'This 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 is a copy of the scaffolding application': 'Toto je kopie aplikace skelet.',
+'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',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'tuto stránku, abyste uviděli, zda se dosáhlo bodu přerušení.',
@@ -623,15 +586,13 @@
 'toggle breakpoint': 'vyp./zap. bod přerušení',
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Na celou obrazovku a zpět',
-'too short': 'Příliš krátké',
 'Traceback': 'Traceback',
 'Translation strings for the application': 'Překlad textů pro aplikaci',
 'try something like': 'try something like',
 'Try the mobile interface': 'Zkuste rozhraní pro mobilní zařízení',
 'try view': 'try view',
-'Twitter': 'Twitter',
+'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.',
 'Unable to check for upgrades': 'Unable to check for upgrades',
 'unable to create application "%s"': 'unable to create application "%s"',
@@ -644,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': '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',
@@ -653,7 +615,6 @@
 'update all languages': 'aktualizovat všechny jazyky',
 'Update:': 'Upravit:',
 'Upgrade': 'Upgrade',
-'upgrade now': 'upgrade now',
 'upgrade now to %s': 'upgrade now to %s',
 'upload': 'nahrát',
 'Upload': 'Upload',
@@ -663,23 +624,27 @@
 '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',
 'Verify Password': 'Zopakujte heslo',
 'Version': 'Verze',
-'Version %s.%s.%s (%s) %s': 'Verze %s.%s.%s (%s) %s',
 'Versioning': 'Verzování',
-'Videos': 'Videa',
-'View': 'Pohled (View)',
 'Views': 'Pohledy',
 'views': 'pohledy',
 'Warning!': 'Warning!',
@@ -692,25 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'Máte aktuální verzi web2py.',
 'web2py online debugger': 'Ladící online web2py program',
-'web2py Recent Tweets': 'Štěbetání na Twitteru o web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
-'Welcome': 'Vítejte',
-'Welcome to web2py': 'Vitejte ve web2py',
-'Welcome to web2py!': 'Vítejte ve web2py!',
-'Which called the function %s located in the file %s': 'která zavolala funkci %s v souboru (kontroléru) %s.',
+'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 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 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,18 +15,28 @@
 '(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',
-'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',
+'@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': 'Acerca de',
 'About application': 'Acerca de la aplicación',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': 'código adicional para su aplicación',
 'Additional code for your application': 'Código adicional para su aplicación',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'admin deshabilitado por falta de contraseña',
@@ -34,34 +44,29 @@
 'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'admin deshabilitado, imposible acceder al archivo con la contraseña',
 'Admin is disabled because insecure channel': 'Admin deshabilitado, el canal no es seguro',
-'Admin is disabled because unsecure channel': 'Admin deshabilitado, el canal no es seguro',
 'Admin language': 'Lenguaje de administración',
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'interfaz administrativa',
 'Administrator Password:': 'Contraseña del Administrador:',
-'An error occured, please %s the page': 'Ha ocurrido un error, por favor %s la página',
-'and rename it (required):': 'y renombrela (requerido):',
 'and rename it:': ' y renombrelo:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'admin deshabilitado, el canal no es seguro',
 'Application': 'Application',
 'application "%s" uninstalled': 'aplicación "%s" desinstalada',
-'application %(appname)s installed with md5sum: %(digest)s': 'application %(appname)s installed with md5sum: %(digest)s',
 'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
 'application compiled': 'aplicación compilada',
 'Application exists already': 'Application exists already',
 'application is compiled and cannot be designed': 'la aplicación está compilada y no puede ser modificada',
 'Application name:': 'Nombre de la aplicación:',
 'Application updated via git pull': 'Application updated via git pull',
+'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"?',
 'Are you sure you want to delete plugin "%s"?': '¿Está seguro que quiere eliminar el plugin "%s"?',
 'Are you sure you want to delete this object?': '¿Está seguro que quiere eliminar este objeto?',
-'Are you sure you want to uninstall application "%s"': '¿Está seguro que desea desinstalar la aplicación "%s"',
 'Are you sure you want to uninstall application "%s"?': '¿Está seguro que desea desinstalar la aplicación "%s"?',
-'Are you sure you want to upgrade web2py now?': '¿Está seguro que desea actualizar web2py ahora?',
 'Are you sure?': '¿Está seguro?',
 'arguments': 'argumentos',
 'at char %s': 'en el carácter %s',
@@ -70,9 +75,8 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENCIÓN: Inicio de sesión requiere una conexión segura (HTTPS) o localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENCIÓN: NO EJECUTE VARIAS PRUEBAS SIMULTANEAMENTE, NO SON THREAD SAFE.',
 'ATTENTION: you cannot edit the running application!': 'ATENCIÓN: ¡no puede modificar la aplicación que se ejecuta!',
-'Autocomplete': 'Autocompletar',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocompletar código Python',
-'Available databases and tables': 'Bases de datos y tablas disponibles',
 'Available Databases and Tables': 'Bases de Datos y Tablas Disponibles',
 'back': 'atrás',
 'Back to the plugins list': 'Regresar a la lista de plugins',
@@ -82,7 +86,6 @@
 'breakpoint': 'punto de ruptura',
 'Breakpoints': 'Breakpoints',
 'breakpoints': 'puntos de ruptura',
-'browse': 'navegar',
 'Bulk Register': 'Bulk Register',
 'Bulk Student Registration': 'Bulk Student Registration',
 'Cache': 'Caché',
@@ -93,14 +96,13 @@
 'can be a git repo': 'puede ser un repositorio git',
 'Cancel': 'Cancelar',
 'Cannot be empty': 'No puede estar vacío',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'No se puede compilar: hay errores en su aplicación. Depure, corrija errores y vuelva a intentarlo.',
 'Cannot compile: there are errors in your app:': 'No se puede compilar: hay errores en su aplicación:',
 'cannot create file': 'no es posible crear archivo',
 'cannot upload file "%(filename)s"': 'no es posible subir archivo "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'cambie contraseña admin',
 'change editor settings': 'cambiar la configuración del editor',
-'Change Password': 'Cambie Contraseña',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'marcar todos',
 'Check for upgrades': 'buscar actualizaciones',
@@ -111,12 +113,9 @@
 'Clear CACHE?': '¿Limpiar CACHÉ?',
 'Clear DISK': 'Limpiar DISCO',
 'Clear RAM': 'Limpiar RAM',
-'click here for online examples': 'haga click aquí para ver ejemplos en línea',
-'click here for the administrative interface': 'haga click aquí para usar la interfaz administrativa',
+'Click 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',
-'click to open': 'click para abrir',
 'Client IP': 'IP del Cliente',
 'code': 'código',
 'Code listing': 'Listado de código',
@@ -124,7 +123,6 @@
 'Command': 'Command',
 'Comment:': 'Comment:',
 'Commit': 'Commit',
-'commit (mercurial)': 'confirmar (mercurial)',
 'Commit form': 'Commit form',
 'Committed files': 'Committed files',
 'Compile': 'Compilar',
@@ -138,9 +136,6 @@
 'Count': 'Contar',
 'Create': 'Crear',
 'create file with filename:': 'cree archivo con nombre:',
-'Create new application using the Wizard': 'Crear nueva aplicación utilizando el asistente',
-'create new application:': 'nombre de la nueva aplicación:',
-'Create new simple application': 'Cree una nueva aplicación',
 'Create/Upload': 'Crear/Subir',
 'created by': 'creado por',
 'Created by:': 'Created by:',
@@ -152,12 +147,9 @@
 'Current session': 'Sesión en curso',
 'currently running': 'actualmente en ejecución',
 'currently saved or': 'actualmente guardado o',
-'customize me!': 'Adáptame!',
 'data uploaded': 'datos subidos',
 'Database': 'Database',
-'database': 'base de datos',
 'Database %s select': 'Database %s select',
-'database %s select': 'selección en base de datos %s',
 'Database administration': 'Database administration',
 'database administration': 'administración base de datos',
 'Database Administration (appadmin)': 'Administración de Base de Datos (appadmin)',
@@ -183,8 +175,6 @@
 'Description': 'Descripción',
 'Description:': 'Description:',
 'design': 'modificar',
-'DESIGN': 'DISEÑO',
-'Design for': 'Diseño para',
 'Detailed traceback description': 'Descripción detallada del rastreo',
 'details': 'detalles',
 'direction: ltr': 'dirección: ltr',
@@ -201,53 +191,41 @@
 'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'documentos',
 'Docs': 'Documentos',
-'Done!': 'Listo!',
 'done!': 'listo!',
 'Downgrade': 'Downgrade',
-'Download': 'Descargar',
 'Download .w2p': 'Download .w2p',
 'Download as .exe': 'Download as .exe',
-'download files via http:': 'descargar archivos via http:',
 'download layouts': 'descargar layouts',
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'descargar plugins',
 'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'Correo electrónico',
-'EDIT': 'EDITAR',
 'Edit': 'editar',
 'edit all': 'edit all',
 'Edit application': 'Editar aplicación',
-'edit controller': 'editar controlador',
 'edit controller:': 'editar controlador:',
 'Edit current record': 'Edite el registro actual',
-'Edit Profile': 'Editar Perfil',
 'edit views:': 'editar vistas:',
 'Editing %s': 'Editando %s',
-'Editing file': 'Editando archivo',
-'Editing file "%s"': 'Editando archivo "%s"',
 'Editing Language file': 'Editando archivo de lenguaje',
-'Editing myclientapi': 'Editando myclientapi',
-'Editing myemail': 'Editando myemail',
 'Editing Plural Forms File': 'Editing Plural Forms File',
-'Editing rbare': 'Editando rbare',
-'Editing ul': 'Editando ul',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'Enterprise Web Framework': 'Framework Web Empresarial',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Bitácora de errores en "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'errores',
-'Errors in form, please check it out.': 'Errores en el formulario, verifique por favor.',
 'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
 'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Atributos de la instancia de Excepción',
 'Exit Fullscreen': 'Salir de pantalla completa',
-'Expand Abbreviation': 'Expandir abreviación',
 'Expand Abbreviation (html files only)': 'Expandir Abreviación (sólo archivos html)',
 'export as csv file': 'exportar como archivo CSV',
 'Exports:': 'Exports:',
@@ -255,13 +233,11 @@
 'exposes:': 'expone:',
 'extends': 'extiende',
 'failed to compile file because:': 'falló la compilación de archivos debido a:',
-'failed to reload module': 'recarga del módulo ha fallado',
 'failed to reload module because:': 'no es posible recargar el módulo por:',
 'File': 'Archivo',
 'file "%(filename)s" created': 'archivo "%(filename)s" creado',
 'file "%(filename)s" deleted': 'archivo "%(filename)s" eliminado',
 'file "%(filename)s" uploaded': 'archivo "%(filename)s" subido',
-'file "%(filename)s" was not deleted': 'archivo "%(filename)s" no fue eliminado',
 'file "%s" of %s restored': 'archivo "%s" de %s restaurado',
 'file changed on disk': 'archivo modificado en el disco',
 'file does not exist': 'archivo no existe',
@@ -277,6 +253,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',
@@ -289,10 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graficación del modelo',
 'Graph Model': 'Graph Model',
+'graph model': 'graficación del modelo',
+'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',
-'Hello World': 'Hola Mundo',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'ayuda',
 'here': 'aquí',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
@@ -300,25 +279,22 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'htmledit',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Si el reporte anterior contiene un número de tiquete este indica un falla en la ejecución del controlador, antes de cualquier intento de ejecutat doctests. Esto generalmente se debe a un error en la indentación o un error por fuera del código de la función.\r\nUn titulo verde indica que todas las pruebas pasaron (si existen). En dicho caso los resultados no se muestran.',
 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
-'Image': 'Imagen',
 'import': 'import',
 'Import/Export': 'Importar/Exportar',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'incluye',
+'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',
 'inspect attributes': 'inspeccionar atributos',
 'Install': 'Instalar',
 'Installation of %(plugin)s for %(app)s': 'Instalación de %(plugin)s para %(app)s',
-'Installation of %(plugin)s for %(app)s app': 'Instalación de %(plugin)s para %(app)s app',
 'Installed applications': 'Aplicaciones instaladas',
+'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,23 +305,28 @@
 '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',
 'Language files (static strings) updated': 'Archivos de lenguaje (cadenas estáticas) actualizados',
 'languages': 'lenguajes',
 'Languages': 'Lenguajes',
-'languages updated': 'lenguajes actualizados',
 'Last name': 'Apellido',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Guardado en:',
@@ -356,20 +337,20 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'listas por ticket',
 'Loading...': 'Loading...',
-'loading...': 'cargando...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals',
-'login': 'inicio de sesión',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 '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',
 'Logout': 'fin de sesión',
 'lost password': 'lost password',
-'Lost Password': 'Contraseña perdida',
 'Main Menu': 'Main Menu',
-'manage': 'gestionar',
 'Manage': 'Gestionar',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
@@ -378,8 +359,8 @@
 'Manage Students': 'Manage Students',
 'Memberships': 'Memberships',
 'merge': 'combinar',
-'models': 'modelos',
 'Models': 'Modelos',
+'models': 'modelos',
 'Modified On': 'Modified On',
 'Modules': 'Módulos',
 'modules': 'módulos',
@@ -389,18 +370,14 @@
 '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',
-'New plugin installed: web2py.plugin.dialog.w2p': 'Nuevo plugin instalado: web2py.plugin.dialog.w2p',
-'New plugin installed: web2py.plugin.math2py.w2p': 'Nuevo plugin instalado: web2py.plugin.math2py.w2p',
-'New plugin installed: web2py.plugin.timezone.w2p': 'Nuevo plugin instalado: web2py.plugin.timezone.w2p',
 'New Record': 'Registro nuevo',
 'new record inserted': 'nuevo registro insertado',
 'New simple application': 'Nueva aplicación',
 'next': 'siguiente',
 'next %s rows': 'next %s rows',
-'next 100 rows': '100 filas siguientes',
 'NO': 'NO',
 'no changes': 'no changes',
 'No databases in this application': 'No hay bases de datos en esta aplicación',
@@ -408,21 +385,19 @@
 'no match': 'no encontrado',
 'no package selected': 'ningún paquete seleccionado',
 'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
-'No ticket_storage.txt found under /private folder': 'No se encontró ticket_storage.txt en la carpeta /private',
 'Node:': 'Node:',
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'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',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
 'OpenShift Output': 'OpenShift Output',
 'or alternatively': 'o alternativamente',
 'Or Get from URL:': 'O obtener desde una URL:',
 'or import from csv file': 'o importar desde archivo CSV',
-'or provide app url:': 'o provea URL de la aplicación:',
-'or provide application url:': 'o provea URL de la aplicación:',
 'Origin': 'Origen',
 'Original/Translation': 'Original/Traducción',
 'Overview': 'Revisión general',
@@ -431,9 +406,12 @@
 'Pack compiled': 'empaquete compiladas',
 'Pack custom': 'empaquetar personalizado',
 'pack plugin': 'empaquetar plugin',
-'PAM authenticated user, cannot change password here': 'usuario autenticado por PAM, no puede cambiar la contraseña aquí',
 'Password': 'Contraseña',
 'password changed': 'contraseña cambiada',
+'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,8 +419,8 @@
 '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',
 'Plugin "%s" in application': 'Plugin "%s" en aplicación',
 'plugin not specified': 'plugin not specified',
@@ -455,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': '100 filas anteriores',
 'Private files': 'Archivos privados',
 'private files': 'archivos privados',
+'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.',
@@ -473,26 +451,35 @@
 'Ram Cleared': 'Ram Cleared',
 '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 ID': 'ID de Registro',
+'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',
-'reload': 'recargar',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 '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',
 'Replace All': 'Reemplazar todos',
 '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',
@@ -505,7 +492,6 @@
 'Revision:': 'Revision:',
 'Role': 'Rol',
 'Roles': 'Roles',
-'Rows in table': 'Filas en la tabla',
 'Rows in Table': 'Rows in Table',
 'Rows selected': 'Filas seleccionadas',
 'rules are not defined': 'reglas no están definidas',
@@ -514,17 +500,14 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Ejecute tests en este archivo (para ejecutarlo en todos los archivos, podrías usar el botón etiquetado como 'test')",
 'Running on %s': 'Ejecutando en %s',
 'Save': 'Guardar',
-'save': 'guardar',
 'Save file:': 'Guardar archivo:',
 'Save file: %s': 'Guardar archivo: %s',
 'Save model as...': 'Save model as...',
 'Save via Ajax': 'Guardar vía Ajax',
 'Saved file hash:': 'Hash del archivo guardado:',
 'Screenshot %s': 'Screenshot %s',
-'Screenshots': 'Screenshots',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'seleccionado(s)',
 'session': 'sesión',
 'session expired': 'sesión expirada',
 'Session saved correctly': 'Session saved correctly',
@@ -532,6 +515,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:',
@@ -545,24 +529,20 @@
 'Start searching': 'Iniciar búsqueda',
 'Start wizard': 'Iniciar asistente',
 'state': 'estado',
-'Static': 'Estáticos',
 'static': 'estáticos',
+'Static': 'Estáticos',
 'Static files': 'Archivos estáticos',
 'Statistics': 'Estadísticas',
 'Step': 'Step',
 'step': 'paso',
 'stop': 'parar',
-'submit': 'enviar',
 'Submit': 'Enviar',
-'Success!': '¡Éxito!',
+'submit': 'enviar',
 'successful': 'exitoso',
-'Sure you want to delete this object?': '¿Está seguro que desea eliminar este objeto?',
 'switch to : db': 'cambiar a : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'tabla',
 'Table': 'Table',
-'Table name': 'Nombre de la tabla',
 'Temporary': 'Temporary',
 'test': 'probar',
 'Testing application': 'Probando aplicación',
@@ -570,11 +550,8 @@
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'La lógica de la aplicación, cada ruta URL se mapea en una función expuesta en el controlador',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'la lógica de la aplicación, cada ruta URL se mapea en una función expuesta en el controlador',
-'the data representation, define database tables and sets': 'la representación de datos, define tablas y conjuntos de base de datos',
 'The data representation, define database tables and sets': 'La representación de datos, define tablas y conjuntos de base de datos',
 'The presentations layer, views are also known as templates': 'La capa de presentación, las vistas también son llamadas plantillas',
-'the presentations layer, views are also known as templates': 'la capa de presentación, las vistas también son llamadas plantillas',
 'Theme': 'Theme',
 'There are no controllers': 'No hay controladores',
 'There are no models': 'No hay modelos',
@@ -587,11 +564,11 @@
 'There are no views': 'No hay vistas',
 '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',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'esta página para ver si un punto de ruptura fue configurado y la depuración es requerida.',
@@ -602,7 +579,6 @@
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': 'Timestamp',
-'TM': 'MR',
 'to  previous version.': 'a la versión previa.',
 'To create a plugin, name a file/folder plugin_[name]': 'Para crear un plugin, nombre un archivo/carpeta plugin_[nombre]',
 'To emulate a breakpoint programatically, write:': 'Para emular un punto de ruptura programáticamente, escriba',
@@ -611,12 +587,11 @@
 'Toggle comment': 'Alternar comentario',
 'Toggle Fullscreen': 'Alternar pantalla completa',
 'Traceback': 'Rastreo',
-'translation strings for the application': 'cadenas de caracteres de traducción para la aplicación',
 'Translation strings for the application': 'Cadenas de caracteres de traducción para la aplicación',
-'try': 'intente',
 'try something like': 'intente algo como',
 'Try the mobile interface': 'Pruebe la interfaz móvil',
 'try view': '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',
@@ -624,15 +599,13 @@
 'unable to delete file "%(filename)s"': 'no es posible eliminar el archivo "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'no es posible eliminar plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': 'No es posible la descarga',
-'Unable to download app': 'No es posible descargar la aplicación',
 'Unable to download app because:': 'No es posible descargar la aplicación porque:',
-'Unable to download because': 'No es posible descargar porque',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'no es posible analizar el archivo CSV',
+'Unable to 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',
@@ -643,27 +616,35 @@
 'Update:': 'Actualice:',
 'Upgrade': 'Upgrade',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'actualize web2py ahora',
 'upload': 'upload',
 'Upload': 'Subir',
-'Upload & install packed application': 'Suba e instale aplicación empaquetada',
 'Upload a package:': 'Subir un paquete:',
 'Upload and install packed application': 'Suba e instale una aplicación empaquetada',
-'upload application:': 'subir aplicación:',
-'Upload existing application': 'Suba esta aplicación',
 'upload file:': 'suba un archivo:',
 'upload plugin file:': 'suba un archivo de plugin:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, y ~(...) para NOT, para crear consultas más complejas.',
 'User': 'User',
+'User %(id)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',
-'view': 'vista',
 'Views': 'Vistas',
 'views': 'vistas',
 'Warning!': 'Warning!',
@@ -676,19 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py está actualizado',
 'web2py online debugger': 'web2py debugger en línea',
-'web2py Recent Tweets': 'Tweets Recientes de web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py actualizado; favor reiniciar',
-'Welcome to web2py': 'Bienvenido a web2py',
+'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': 'SÍ',
 'Yes': 'Sí',
-'You are going to install': 'Vas a instalar',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'Puedes inspeccionar las variables utilizando la terminal de abajo',
+'You have 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

@@ -11,28 +11,34 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%d-%m-%Y',
 '%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
-'(**%.0d MB**)': '(**%.0d MB**)',
-'(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
-'(requires internet access)': '(nécessite un accès Internet)',
 '(requires internet access, experimental)': '(nécessite un accès Internet, expérimentale)',
 '(something like "it-it")': '(quelque chose comme "it-it") ',
 '(version %s)': '(version %s)',
-'**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
-'**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
-'**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 '?': '?',
+'@markmin\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',
-'``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
-'A new version of web2py is available: %s': 'Une nouvelle version de web2py est disponible: %s ',
-'A new version of web2py is available: Version 1.68.2 (2009-10-21 09:59:29)\n': 'Une nouvelle version de web2py est disponible: Version 1.68.2 (2009-10-21 09:59:29)\r\n',
+'@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': 'à propos',
-'About application': "A propos de l'application",
+'About': 'À propos',
+'About application': "À propos de l'application",
 'Accept Terms': 'Termes acceptés',
 'Add breakpoint': 'Ajouter une interruption',
-'additional code for your application': 'code supplémentaire pour votre application',
 'Additional code for your application': 'Code additionnel pour votre application',
-'Admin design page': '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,30 +47,27 @@
 'Admin language': "Language de l'admin",
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': "interface d'administration",
-'Administrator Password:': 'Mot de passe 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):',
+'Administrator Password:': "Mot de passe de l'administrateur:",
 'and rename it:': 'et renommez-le:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'appadmin est désactivé parce que canal non sécurisé',
 'Application': 'Application',
 'application "%s" uninstalled': 'application "%s" désinstallée',
-'application %(appname)s installed with md5sum: %(digest)s': 'application %(appname)s installée avec md5sum: %(digest)s',
 'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
 'application compiled': 'application compilée',
 'Application exists already': 'Application exists already',
 'application is compiled and cannot be designed': "l'application est compilée et ne peut être modifiée",
 'Application name:': "Nom de l'application:",
 'Application updated via git pull': 'Application updated via git pull',
-'are not used': 'are not used',
-'are not used yet': 'are not used yet',
+'Apply changes': 'Apply changes',
+'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 +75,14 @@
 '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': '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',
@@ -88,74 +91,70 @@
 'Cache': 'Cache',
 'cache': 'cache',
 'Cache Cleared': 'Cache Cleared',
-'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Cache Keys': 'Cache Keys',
 'cache, errors and sessions cleaned': 'cache, erreurs et sessions nettoyés',
 'can be a git repo': 'can be a git repo',
-'Cancel': '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:',
 'cannot create file': 'ne peut pas créer de fichier',
 'cannot upload file "%(filename)s"': 'ne peut pas charger le fichier "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Changer le mot de passe admin',
 'change editor settings': 'change editor settings',
+'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 CACHE?': 'Clear CACHE?',
-'Clear DISK': 'Clear DISK',
-'Clear RAM': 'Clear RAM',
+'Clear': 'Effacer',
+'Clear CACHE?': 'Effacer le CACHE?',
+'Clear DISK': 'Effacer le DISQUE',
+'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',
-'Comment:': 'Comment:',
-'Commit': 'Commit',
-'Commit form': 'Commit form',
-'Committed files': 'Committed files',
+'Command': 'Commande',
+'Comment:': 'Commentaire:',
+'Commit': 'Valider',
+'Commit form': 'Valider le formulaire',
+'Committed files': 'Fichiers validés',
 'Compile': 'compiler',
 'Compile (all or nothing)': 'Compile (all or nothing)',
 'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'application compilée enlevée',
 'Condition': 'Condition',
-'continue': '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 On': 'Created On',
-'Created on:': 'Created on:',
+'Created by:': 'Créé par:',
+'Created On': 'Créé le',
+'Created on:': 'Créé le:',
 'crontab': 'crontab',
 'Current request': 'Requête actuelle',
 'Current response': 'Réponse actuelle',
 'Current session': 'Session en cours',
 'currently running': 'tourne actuellement',
 'currently saved or': 'actuellement enregistré ou',
-'data uploaded': 'données chargées',
-'Database': 'Database',
-'database': 'base de données',
+'data uploaded': 'données téléversées',
+'Database': 'Base de données',
 'Database %s select': 'Database %s select',
-'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 +164,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 +172,25 @@
 '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',
-'Disabled': 'Disabled',
+'Disable': 'Désactiver',
+'Disabled': 'Désactivé',
 'disabled in demo mode': 'disabled in demo mode',
 'disabled in GAE mode': 'disabled in GAE mode',
 'disabled in multi user mode': 'disabled in multi user mode',
-'DISK': 'DISK',
+'DISK': 'DISQUE',
 'Disk Cache Keys': 'Disk Cache Keys',
-'Disk Cleared': 'Disk Cleared',
-'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.',
+'Disk Cleared': 'Disque effacé',
 'Display line numbers': 'Display line numbers',
 'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
-'docs': 'docs',
-'Docs': 'Docs',
+'docs': 'documents',
+'Docs': 'Documents',
 'done!': 'fait!',
 'Downgrade': 'Downgrade',
 'Download .w2p': 'Download .w2p',
@@ -200,44 +199,42 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'télécharger plugins',
 'Download plugins from repository': 'Download plugins from repository',
-'EDIT': 'MODIFIER',
-'Edit': 'modifier',
-'edit all': 'edit all',
+'E-mail': 'E-mail',
+'Edit': 'Modifier',
+'edit all': 'tout modifier',
 'Edit application': "Modifier l'application",
-'edit controller': 'modifier contrôleur',
-'edit controller:': 'edit controller:',
-'Edit current record': 'Modifier cette entrée',
-'edit views:': 'modifier vues:',
-'Editing %s': 'Editing %s',
-'Editing file': 'Modifier le fichier',
-'Editing file "%s"': 'Modifier le fichier "% s" ',
+'edit controller:': 'modifier le contrôleur:',
+'Edit current record': 'Modifier cet enregistrement',
+'edit views:': 'modifier les vues:',
+'Editing %s': 'Modifier %s',
 'Editing Language file': 'Modifier le fichier de langue',
-'Editing Plural Forms File': 'Editing Plural Forms File',
-'Editor': 'Editor',
-'Email Address': 'Email Address',
-'Enable': 'Enable',
+'Editing Plural Forms File': 'Modifier le fichier du formulaire pluriel',
+'Editor': 'Éditeur',
+'Email Address': 'Adresse courriel',
+'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',
-'Errors': 'erreurs',
+'Error ticket': "Billet d'erreur",
+'Errors': 'Erreurs',
 'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
 'Exception %s': 'Exception %s',
 'Exception instance attributes': "Attributs d'instance Exception",
 'Exit Fullscreen': 'Exit Fullscreen',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'export au format CSV',
-'Exports:': '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 +244,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': 'Filename',
-'Files added': 'Files added',
+'filename': 'nom de fichier',
+'Filename': 'Nom de fichier',
+'Files added': 'Fichiers ajoutés',
 'filter': 'filtre',
-'Find Next': 'Find Next',
-'Find Previous': 'Find Previous',
-'Form has errors': 'Form has errors',
+'Find Next': 'Trouver les suivants',
+'Find Previous': 'Trouver les précédents',
+'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',
-'Generate': 'Generate',
+'GAE Password': 'Mot de passe GAE',
+'Generate': 'Générer',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
@@ -267,34 +266,35 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
-'Graph Model': 'Graph Model',
+'Graph Model': 'Représentation graphique du modèle',
+'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',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': "Si le rapport ci-dessus contient un numéro de ticket, cela indique une défaillance dans l'exécution du contrôleur, avant toute tentative d'exécuter les doctests. Cela est généralement dû à une erreur d'indentation ou une erreur à l'extérieur du code de la fonction.\r\nUn titre vert indique que tous les tests (si définis) sont passés. Dans ce cas, les résultats des essais ne sont pas affichées.",
 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
-'import': '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',
-'insert new %s': 'insérer nouveau %s',
 'inspect attributes': 'inspect attributes',
 'Install': 'Installer',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Applications installées',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'erreur interne',
@@ -303,22 +303,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 +336,20 @@
 'Line number': 'Line number',
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
-'Loading...': 'Loading...',
-'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',
@@ -346,26 +358,26 @@
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Manage Students',
 'Memberships': 'Memberships',
-"Mercurial Version Control System Interface[[NEWLINE]]for application '%s'": "Mercurial Version Control System Interface[[NEWLINE]]for application '%s'",
 'merge': 'fusionner',
 'Models': 'Modèles',
 'models': 'modèles',
-'Modified On': '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 %s rows': 'next %s rows',
-'next 100 rows': '100 lignes suivantes',
+'next': 'suivant',
+'next %s rows': '%s lignes suivantes',
 'NO': 'NON',
 'no changes': 'no changes',
 'No databases in this application': 'Aucune base de données dans cette application',
@@ -374,10 +386,11 @@
 'no package selected': 'no package selected',
 'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
 'Node:': 'Node:',
-'Not Authorized': 'Not Authorized',
-'Not supported': 'Not supported',
+'Not Authorized': 'Pas autorisé',
+'Not supported': 'Pas supporté',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
-'Number of entries: **%s**': 'Number of entries: **%s**',
+'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',
@@ -385,8 +398,7 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'ou importer depuis un fichier CSV ',
-'or provide app url:': "ou fournir l'URL de l'app:",
-'or provide application url:': "ou fournir l'URL de l'application:",
+'Origin': 'Origin',
 'Original/Translation': 'Original / Traduction',
 'Overview': 'Overview',
 'Overwrite installed app': "Écraser l'application installée",
@@ -394,36 +406,41 @@
 'Pack compiled': 'paquet compilé',
 'Pack custom': 'Pack custom',
 'pack plugin': 'paquet plugin',
-'PAM authenticated user, cannot change password here': 'Utilisateur authentifié par PAM, vous ne pouvez pas changer le mot de passe ici',
+'Password': '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': 'Plugins',
+'plugins': 'plugiciels',
+'Plugins': 'Plugiciels',
 'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Propulsé par',
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': '100 lignes précédentes',
 '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',
@@ -432,56 +449,65 @@
 'RAM': 'RAM',
 'RAM Cache Keys': 'RAM Cache Keys',
 'Ram Cleared': 'Ram Cleared',
-'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
-'Rapid Search': 'Rapid Search',
-'Record': 'Record',
-'record': 'entrée',
+'Rapid Search': 'Recherche rapide',
+'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 All': 'Replace All',
+'Replace': 'Remplacer',
+'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',
-'Revert': 'Revert',
-'revert': 'revenir',
+'return': 'retour',
+'Revert': "Revenir vers l'arrière",
+'revert': "revenir vers l'arrière",
 'reverted to revision %s': 'reverted to revision %s',
-'Revision %s': 'Revision %s',
-'Revision:': 'Revision:',
-'Role': 'Role',
-'Roles': 'Roles',
+'Revision %s': 'Révision %s',
+'Revision:': 'Révision:',
+'Role': 'Rôle',
+'Roles': 'Rôles',
 'Rows in Table': 'Rows in Table',
-'Rows in table': 'Lignes de la table',
 'Rows selected': 'Lignes sélectionnées',
 'rules are not defined': 'rules are not defined',
 'Run tests': 'Run tests',
 'Run tests in this file': 'Run tests in this file',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Lancer les tests dans ce fichier (pour lancer tous les fichiers, vous pouvez également utiliser le bouton nommé 'test')",
 'Running on %s': 'Running on %s',
-'Save': 'Enregistrer',
-'save': 'sauver',
-'Save file:': 'Save file:',
-'Save file: %s': 'Save file: %s',
-'Save model as...': 'Save model as...',
-'Save via Ajax': 'Save via Ajax',
+'Save': 'Sauvegarder',
+'Save file:': 'Sauvegarder le fichier:',
+'Save file: %s': 'Sauvegarder le fichier : %s',
+'Save model as...': 'Sauvegarder le modèle sous...',
+'Save via Ajax': 'Sauvegarder via Ajax',
 'Saved file hash:': 'Hash du Fichier enregistré:',
-'Screenshot %s': 'Screenshot %s',
-'Search': 'Search',
-'Searching: **%s** %%{file}': 'Searching: **%s** %%{file}',
+'Screenshot %s': "Capture d'écran %s",
+'Search': 'Rechercher',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'sélectionnés',
 'session': 'session',
 'session expired': 'la session a expiré ',
 'Session saved correctly': 'Session saved correctly',
@@ -489,74 +515,70 @@
 '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',
-'Start a new app': 'Start a new app',
-'Start searching': 'Start searching',
+'source : filesystem': 'source : système de fichier',
+'Start a new app': 'Commencer une nouvelle application',
+'Start searching': 'Débuté la recherche',
 'Start wizard': "Démarrer l'assistant",
 'state': 'état',
-'Static': 'Static',
-'static': 'statiques',
+'static': 'statique',
+'Static': 'Statique',
 'Static files': 'Fichiers statiques',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
-'stop': 'stop',
+'stop': 'arrêt',
+'Submit': 'Envoyer',
 'submit': 'envoyer',
-'Submit': 'Submit',
-'successful': 'successful',
-'Sure you want to delete this object?': 'Vous êtes sûr de vouloir supprimer cet objet? ',
-'switch to : db': 'switch to : db',
+'successful': 'réussi',
+'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.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': "la logique de l'application, chaque chemin d'URL est mappé dans une fonction exposée dans le contrôleur",
 'The application logic, each URL path is mapped in one exposed function in the controller': "La logique de l'application, chaque chemin d'URL est mappé avec une fonction exposée dans le contrôleur",
-'the data representation, define database tables and sets': 'La représentation des données, définir les tables et ensembles de la base de données',
 'The data representation, define database tables and sets': 'La représentation des données, définir les tables et ensembles de la base de données',
 'The presentations layer, views are also known as templates': 'Les couches de présentation, les vues sont également appelées modples',
-'the presentations layer, views are also known as templates': 'la couche de présentation, les vues sont également appelées modèles',
-'Theme': '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 ',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
 'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
 'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
-'Ticket': 'Ticket',
-'Ticket ID': 'Ticket ID',
-'Ticket Missing': 'Ticket Missing',
+'Ticket': 'Billet',
+'Ticket ID': 'Identifiant du Billet',
+'Ticket Missing': 'Billet manquant',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
-'TM': 'MD',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'à la version précédente.',
 'To create a plugin, name a file/folder plugin_[name]': 'Pour créer un plugin, créer un fichier /dossier plugin_[nom]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -565,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
-'translation strings for the application': "chaînes de traduction de l'application",
 'Translation strings for the application': "Chaînes de traduction pour l'application",
-'try': 'essayer',
 'try something like': 'essayez quelque chose comme',
-'Try the mobile interface': 'Try the mobile interface',
-'try view': 'try view',
+'Try the mobile interface': "Essayer l'interface pour mobile",
+'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',
@@ -578,15 +599,13 @@
 'unable to delete file "%(filename)s"': 'impossible de supprimer le fichier "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'impossible de supprimer le plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': 'Impossible de télécharger',
-'Unable to download app': "Impossible de télécharger l'app",
 'Unable to download app because:': "Impossible de télécharger l'app car:",
-'Unable to download because': 'Impossible de télécharger car',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': "impossible d'analyser les fichiers CSV",
+'Unable to 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,54 +614,65 @@
 'update': 'mettre à jour',
 'update all languages': 'mettre à jour toutes les langues',
 'Update:': 'Mise à jour:',
-'Upgrade': 'Upgrade',
-'upgrade now': 'mettre à jour maintenant',
-'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'mettre à jour web2py maintenant',
-'upload': 'charger',
-'Upload': 'Upload',
-'Upload & install packed application': "Charger & installer l'application empaquetée",
-'Upload a package:': 'Charger un paquet:',
-'Upload and install packed application': 'Upload and install packed application',
-'upload application:': "charger l'application:",
-'Upload existing application': 'Charger une application existante',
-'upload file:': 'charger le fichier:',
+'Upgrade': 'Mese à jour de version',
+'upgrade now to %s': 'mettre à jour maintenant à %s',
+'upload': 'téléversé',
+'Upload': 'Téléversé',
+'Upload a package:': 'Téléverser un paquet:',
+'Upload and install packed application': 'Téléversement et installation du paquet applicatif',
+'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',
-'Username': 'Username',
-'Users': 'Users',
+'User': 'Utilisateur',
+'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': "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',
-'view': 'vue',
 'Views': 'Vues',
 'views': 'vues',
 'Warning!': 'Warning!',
 'WARNING:': 'WARNING:',
 'WARNING: The following views could not be compiled:': 'WARNING: The following views could not be compiled:',
-'Web Framework': 'Framework Web',
-'web2py Admin Password': 'web2py Admin Password',
-'web2py apps to deploy': 'web2py apps to deploy',
+'Web Framework': 'Cadre Web',
+'web2py Admin Password': 'Mot de passe admin web2py',
+'web2py apps to deploy': 'applications web2py à deployer',
 'web2py Debugger': 'web2py Debugger',
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py est à jour',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'Tweets récents sur web2py ',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py mis à jour; veuillez le redémarrer',
-'Working...': '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

@@ -11,19 +11,32 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access)': '(requires internet access)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(למשל "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\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',
-'A new version of web2py is available: %s': 'גירסא חדשה של web2py זמינה: %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': 'Abort',
 'About': 'אודות',
 'About application': 'אודות אפליקציה',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': 'קוד נוסף עבור האפליקציה שלך',
 'Additional code for your application': 'Additional code for your application',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'ממשק המנהל מנוטרל כי לא הוגדרה סיסמת מנהל',
@@ -35,7 +48,6 @@
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'administrative interface',
 'Administrator Password:': 'סיסמת מנהל',
-'and rename it (required):': 'ושנה את שמו (חובה):',
 'and rename it:': 'ושנה את שמו:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'מנהל מסד הנתונים',
@@ -48,13 +60,13 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': 'האם אתה בטוח שברצונך למחוק את התוסף "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'Are you sure you want to uninstall application "%s"?': 'האם אתה בטוח שברצונך להסיר את האפליקציה "%s"?',
-'Are you sure you want to upgrade web2py now?': 'האם אתה בטוח שאתה רוצה לשדרג את web2py עכשיו?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'פרמטרים',
 'at char %s': 'at char %s',
@@ -63,8 +75,8 @@
 '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',
 'back': 'אחורה',
 'Back to the plugins list': 'Back to the plugins list',
@@ -90,6 +102,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 +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',
-'click to check for upgrades': 'לחץ כדי לחפש עדכונים',
+'Client IP': 'Client IP',
 'code': 'קוד',
 'Code listing': 'Code listing',
 'collapse/expand all': 'collapse/expand all',
@@ -122,8 +136,6 @@
 'Count': 'Count',
 'Create': 'צור',
 'create file with filename:': 'צור קובץ בשם:',
-'create new application:': 'צור אפליקציה חדשה:',
-'Create new simple application': 'צור אפליקציה חדשה',
 'Create/Upload': 'Create/Upload',
 'created by': 'נוצר ע"י',
 'Created by:': 'Created by:',
@@ -137,9 +149,7 @@
 'currently saved or': 'נשמר כעת או',
 'data uploaded': 'המידע הועלה',
 'Database': 'Database',
-'database': 'מסד נתונים',
 'Database %s select': 'Database %s select',
-'database %s select': 'מסד הנתונים %s נבחר',
 'Database administration': 'Database administration',
 'database administration': 'ניהול מסד נתונים',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
@@ -162,6 +172,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,24 +199,24 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
-'EDIT': 'ערוך!',
+'E-mail': 'E-mail',
 'Edit': 'ערוך',
 'edit all': 'edit all',
 'Edit application': 'ערוך אפליקציה',
-'edit controller': 'ערוך בקר',
 'edit controller:': 'edit controller:',
 'Edit current record': 'ערוך רשומה נוכחית',
 'edit views:': 'ערוך קיבצי תצוגה:',
 'Editing %s': 'Editing %s',
-'Editing file "%s"': 'עורך את הקובץ "%s"',
 'Editing Language file': 'עורך את קובץ השפה',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'Enterprise Web Framework': 'סביבת הפיתוח לרשת',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'דו"ח שגיאות עבור אפליקציה "%(app)s"',
 'Error snapshot': 'Error snapshot',
@@ -239,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.': 'פונקציות שלא הוגדר להן doctest ירשמו כבדיקות ש[עברו בהצלחה].',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -253,8 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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',
@@ -262,7 +279,6 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'עורך ויזואלי',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -272,13 +288,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',
-'insert new': 'הכנס נוסף',
-'insert new %s': 'הכנס %s נוסף',
 'inspect attributes': 'inspect attributes',
 'Install': 'התקן',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'אפליקציות מותקנות',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'שגיאה מובנית',
@@ -287,21 +303,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': 'רשיון עבור',
@@ -311,12 +337,14 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'טוען...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'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 +365,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': 'רשומה חדשה',
@@ -348,7 +378,6 @@
 'New simple application': 'New simple application',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': '100 הרשומות הבאות',
 'NO': 'לא',
 'no changes': 'no changes',
 'No databases in this application': 'אין מסדי נתונים לאפליקציה זו',
@@ -360,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',
@@ -367,7 +398,7 @@
 'or alternatively': 'or alternatively',
 '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': 'התקן על גבי אפלקציה מותקנת',
@@ -375,8 +406,12 @@
 'Pack compiled': 'ארוז מקומפל',
 '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 +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)s" נמחק',
 'Plugin "%s" in application': 'פלאגין "%s" של אפליקציה',
@@ -397,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': '100 הרשומות הקודמות',
 'Private files': 'Private files',
 'private files': 'private files',
+'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.',
@@ -415,21 +451,35 @@
 'Ram Cleared': 'Ram Cleared',
 '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',
@@ -443,7 +493,6 @@
 'Role': 'Role',
 'Roles': 'Roles',
 'Rows in Table': 'Rows in Table',
-'Rows in table': 'רשומות בטבלה',
 'Rows selected': 'רשומות נבחרו',
 'rules are not defined': 'rules are not defined',
 'Run tests': 'Run tests',
@@ -459,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'נבחרו',
 'session': 'session',
 'session expired': 'תם הסשן',
 'Session saved correctly': 'Session saved correctly',
@@ -467,6 +515,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:',
@@ -480,21 +529,19 @@
 'Start searching': 'Start searching',
 'Start wizard': 'start wizard',
 'state': 'מצב',
-'Static': 'Static',
 'static': 'קבצים סטאטיים',
+'Static': 'Static',
 'Static files': 'קבצים סטאטיים',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'submit': 'שלח',
 'Submit': 'Submit',
+'submit': 'שלח',
 'successful': 'successful',
-'Sure you want to delete this object?': 'האם אתה בטוח שברצונך למחוק אובייקט זה?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'טבלה',
 'Table': 'Table',
 'Temporary': 'Temporary',
 'test': 'בדיקות',
@@ -502,12 +549,9 @@
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"שאליתה" היא תנאי כגון "db1.table1.filed1=\'value\'" ביטוי כמו db.table1.field1=db.table2.field1 יחולל join',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'הלוגיקה של האפליקציה, כל url ממופה לפונקציה חשופה בבקר',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'the data representation, define database tables and sets': 'ייצוג המידע, בו מוגדרים טבלאות ומבנים',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'the presentations layer, views are also known as templates': 'שכבת התצוגה, המכונה גם template',
 'Theme': 'Theme',
 'There are no controllers': 'אין בקרים',
 'There are no models': 'אין מבני נתונים',
@@ -520,11 +564,11 @@
 'There are no views': 'אין קבצי תצוגה',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'these files are served without processing, your images go here': 'אלו הם קבצים הנשלחים מהשרת ללא עיבוד. הכנס את התמונות כאן',
+'This 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 ',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
@@ -534,7 +578,7 @@
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
-'TM': 'סימן רשום',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'אין גירסא קודמת',
 'To create a plugin, name a file/folder plugin_[name]': 'כדי ליצור תוסף, קרא לקובץ או סיפריה בשם לפי התבנית plugin_[name]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -543,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
-'translation strings for the application': 'מחרוזות תרגום עבור האפליקציה',
 'Translation strings for the application': 'Translation strings for the application',
-'try': 'נסה',
 'try something like': 'נסה משהו כמו',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'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': 'לא ניתן היה לבדוק אם יש שדרוגים',
@@ -557,12 +600,12 @@
 'unable to delete file plugin "%(plugin)s"': 'נכשל במחיקת התוסף "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
 'Unable to download app because:': 'לא ניתן היה להוריד את האפליקציה כי:',
-'Unable to download because': 'לא הצלחתי להוריד כי',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'לא הצלחתי לנתח את הקלט של קובץ csv',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'לא ניתן להסיר את "%s"',
 'unable to upgrade because "%s"': 'לא ניתן היה לשדרג כי "%s"',
 'uncheck all': 'הסר סימון מהכל',
@@ -572,28 +615,36 @@
 'update all languages': 'עדכן את כלל קיבצי השפה',
 'Update:': 'עדכן:',
 'Upgrade': 'Upgrade',
-'upgrade now': 'upgrade now',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'שדרג את web2py עכשיו',
 'upload': 'upload',
 'Upload': 'Upload',
-'Upload & install packed application': 'העלה והתקן אפליקציה ארוזה',
 'Upload a package:': 'Upload a package:',
 'Upload and install packed application': 'Upload and install packed application',
-'upload application:': 'העלה אפליקציה:',
 'upload file:': 'העלה קובץ:',
 'upload plugin file:': 'העלה קובץ תוסף:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'השתמש ב (...)&(...) עבור תנאי AND, (...)|(...) עבור תנאי OR ו~(...) עבור תנאי NOT ליצירת שאילתות מורכבות',
-'Use an url:': 'Use an url:',
 'User': 'User',
+'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': 'מנגנון גירסאות',
-'view': 'הצג',
 'Views': 'מראה',
 'views': 'מראה',
 'Warning!': 'Warning!',
@@ -606,17 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py מותקנת בגירסתה האחרונה',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'ציוצים אחרונים של web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py שודרגה; נא אתחל אותה',
+'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

@@ -11,21 +11,32 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%d/%m/%Y',
 '%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
-'(requires internet access)': '(requires internet access)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(qualcosa simile a "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.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',
-'A new version of web2py is available: %s': 'È disponibile una nuova versione di web2py: %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': 'Abort',
 'About': 'informazioni',
 'About application': "Informazioni sull'applicazione",
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': 'righe di codice aggiuntive per la tua applicazione',
 'Additional code for your application': 'Additional code for your application',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'amministrazione disabilitata per mancanza di password amministrativa',
@@ -37,8 +48,6 @@
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'administrative interface',
 'Administrator Password:': 'Password Amministratore:',
-'An error occured, please %s the page': 'An error occured, please %s the page',
-'and rename it (required):': 'e rinominala (obbligatorio):',
 'and rename it:': 'e rinominala:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin ',
@@ -51,13 +60,13 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': 'Confermi di voler cancellare il plugin "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'Are you sure you want to uninstall application "%s"?': 'Confermi di voler disinstallare l\'applicazione "%s"?',
-'Are you sure you want to upgrade web2py now?': 'Confermi di voler aggiornare web2py ora?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'arguments',
 'at char %s': 'at char %s',
@@ -66,8 +75,8 @@
 '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',
 'back': 'indietro',
 'Back to the plugins list': 'Back to the plugins list',
@@ -93,7 +102,7 @@
 'Change Admin Password': 'Change Admin Password',
 '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',
@@ -104,11 +113,10 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
-'click here for online examples': 'clicca per vedere gli esempi',
-'click here for the administrative interface': "clicca per l'interfaccia amministrativa",
+'Click 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',
@@ -123,15 +131,11 @@
 'compiled application removed': "rimosso il codice compilato dell'applicazione",
 'Condition': 'Condition',
 'continue': 'continue',
-'Controller': 'Controller',
 'Controllers': 'Controllers',
 'controllers': 'controllers',
-'Copyright': 'Copyright',
 'Count': 'Count',
 'Create': 'crea',
 'create file with filename:': 'crea un file col nome:',
-'create new application:': 'create new application:',
-'Create new simple application': 'Crea nuova applicazione',
 'Create/Upload': 'Create/Upload',
 'created by': 'creato da',
 'Created by:': 'Created by:',
@@ -143,18 +147,14 @@
 'Current session': 'Sessione (session) corrente',
 'currently running': 'currently running',
 'currently saved or': 'attualmente salvato o',
-'customize me!': 'Personalizzami!',
 'data uploaded': 'dati caricati',
 'Database': 'Database',
-'database': 'database',
 'Database %s select': 'Database %s select',
-'database %s select': 'database %s select',
 'Database administration': 'Database administration',
 'database administration': 'amministrazione database',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Data and Ora',
 'db': 'db',
-'DB Model': 'Modello di DB',
 'Debug': 'Debug',
 'defines tables': 'defininisce le tabelle',
 'Delete': 'Cancella',
@@ -172,6 +172,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,25 +199,24 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
-'EDIT': 'MODIFICA',
+'E-mail': 'E-mail',
 'Edit': 'modifica',
 'edit all': 'edit all',
 'Edit application': 'Modifica applicazione',
-'edit controller': 'modifica controller',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Modifica record corrente',
-'edit profile': 'modifica profilo',
-'Edit This App': 'Modifica questa applicazione',
 'edit views:': 'modifica viste (view):',
 'Editing %s': 'Editing %s',
 'Editing Language file': 'Editing Language file',
 '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',
-'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Log degli errori per "%(app)s"',
 'Error snapshot': 'Error snapshot',
@@ -226,7 +226,6 @@
 'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Exception instance attributes',
 'Exit Fullscreen': 'Exit Fullscreen',
-'Expand Abbreviation': 'Expand Abbreviation',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'esporta come file CSV',
 'Exports:': 'Exports:',
@@ -251,14 +250,15 @@
 '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',
 'GAE Password': 'GAE Password',
 'Generate': 'Generate',
-'Get from URL:': 'Get from URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
@@ -266,9 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
-'Hello World': 'Salve Mondo',
+'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': 'aiuto',
 'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
@@ -276,7 +279,6 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'modifica come html',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -286,14 +288,13 @@
 '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',
-'insert new %s': 'inserisci nuovo %s',
 'inspect attributes': 'inspect attributes',
 'Install': 'installa',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Applicazioni installate',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'errore interno',
@@ -302,26 +303,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',
 'License for': 'Licenza relativa a',
 'License:': 'License:',
 'Line Nr': 'Line Nr',
@@ -329,12 +337,14 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'caricamento...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'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',
@@ -348,7 +358,6 @@
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Manage Students',
 'Memberships': 'Memberships',
-'Menu Model': 'Menu Modelli',
 'merge': 'unisci',
 'Models': 'Modelli',
 'models': 'modelli',
@@ -356,10 +365,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)',
@@ -367,7 +378,6 @@
 'New simple application': 'New simple application',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'prossime 100 righe',
 'NO': 'NO',
 'no changes': 'no changes',
 'No databases in this application': 'Nessun database presente in questa applicazione',
@@ -379,15 +389,16 @@
 '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',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
 'OpenShift Output': 'OpenShift Output',
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'oppure importa da file CSV',
-'or provide app url:': "oppure fornisci url dell'applicazione:",
+'Origin': 'Origin',
 'Original/Translation': 'Originale/Traduzione',
 'Overview': 'Overview',
 'Overwrite installed app': 'sovrascrivi applicazione installata',
@@ -395,8 +406,12 @@
 'Pack compiled': 'crea pacchetto del codice compilato',
 'Pack custom': 'Pack custom',
 'pack plugin': 'crea pacchetto del plugin',
-'PAM authenticated user, cannot change password here': 'utente autenticato tramite PAM, impossibile modificare password qui',
+'Password': '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 +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" cancellato',
 'Plugin "%s" in application': 'Plugin "%s" nell\'applicazione',
@@ -417,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': '100 righe precedenti',
 'Private files': 'Private files',
 'private files': 'private files',
+'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.',
@@ -435,22 +451,35 @@
 'Ram Cleared': 'Ram Cleared',
 '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',
-'reload': 'reload',
+'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': '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',
@@ -463,7 +492,6 @@
 'Revision:': 'Revision:',
 'Role': 'Role',
 'Roles': 'Roles',
-'Rows in table': 'Righe nella tabella',
 'Rows in Table': 'Rows in Table',
 'Rows selected': 'Righe selezionate',
 'rules are not defined': 'rules are not defined',
@@ -480,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'selezionato',
 'session': 'session',
 'session expired': 'sessions scaduta',
 'Session saved correctly': 'Session saved correctly',
@@ -488,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': 'sito',
 'Size of cache:': 'Size of cache:',
@@ -501,22 +529,19 @@
 'Start searching': 'Start searching',
 'Start wizard': 'start wizard',
 'state': 'stato',
-'Static': 'Static',
 'static': 'statico',
+'Static': 'Static',
 'Static files': 'Files statici',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'Stylesheet': 'Foglio di stile (stylesheet)',
-'submit': 'invia',
 'Submit': 'Submit',
+'submit': 'invia',
 'successful': 'successful',
-'Sure you want to delete this object?': 'Vuoi veramente cancellare questo oggetto?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'tabella',
 'Table': 'Table',
 'Temporary': 'Temporary',
 'test': 'test',
@@ -524,12 +549,9 @@
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La richiesta (query) è una condizione come ad esempio  "db.tabella1.campo1==\'valore\'". Una condizione come "db.tabella1.campo1==db.tabella2.campo2" produce un "JOIN" SQL.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'logica dell\'applicazione, ogni percorso "URL" corrisponde ad una funzione esposta da un controller',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'the data representation, define database tables and sets': 'rappresentazione dei dati, definizione di tabelle di database e di "set" ',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'the presentations layer, views are also known as templates': 'Presentazione dell\'applicazione, viste (views, chiamate anche "templates")',
 'Theme': 'Theme',
 'There are no controllers': 'Non ci sono controller',
 'There are no models': 'Non ci sono modelli',
@@ -542,11 +564,11 @@
 'There are no views': 'Non ci sono viste ("view")',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'these files are served without processing, your images go here': 'questi files vengono serviti così come sono, le immagini vanno qui',
+'This 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',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
@@ -556,7 +578,7 @@
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
-'TM': 'TM',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'torna a versione precedente',
 'To create a plugin, name a file/folder plugin_[name]': 'Per creare un plugin, chiamare un file o cartella plugin_[nome]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -565,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
-'translation strings for the application': "stringhe di traduzioni per l'applicazione",
 'Translation strings for the application': 'Translation strings for the application',
-'try': 'prova',
 'try something like': 'prova qualcosa come',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'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',
@@ -579,13 +600,12 @@
 'unable to delete file plugin "%(plugin)s"': 'impossibile rimuovere file di plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
 'Unable to download app because:': 'Impossibile scaricare applicazione perché',
-'Unable to download because': 'Impossibile scaricare perché',
-'Unable to download because:': 'Unable to download because:',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'non riesco a decodificare questo file CSV',
+'Unable to 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',
@@ -596,29 +616,35 @@
 'Update:': 'Aggiorna:',
 'Upgrade': 'Upgrade',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'upgrade web2py now',
 'upload': 'upload',
 'Upload': 'Upload',
-'Upload & install packed application': 'Carica ed installa pacchetto con applicazione',
 'Upload a package:': 'Upload a package:',
 'Upload and install packed application': 'Upload and install packed application',
-'upload application:': 'carica applicazione:',
 'upload file:': 'carica file:',
 'upload plugin file:': 'carica file di plugin:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Per costruire richieste (query) più complesse si usano (...)&(...) come "e" (AND), (...)|(...) come "o" (OR), e ~(...) come negazione (NOT).',
-'Use an url:': 'Use an url:',
 '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',
 'Versioning': 'Versioning',
-'versioning': 'sistema di versioni',
-'View': 'Vista',
-'view': 'vista',
 'Views': 'Viste',
 'views': 'viste',
 'Warning!': 'Warning!',
@@ -631,19 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py è aggiornato',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'Tweets recenti per web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py aggiornato; prego riavviarlo',
-'Welcome %s': 'Benvenuto %s',
-'Welcome to web2py': 'Benvenuto su web2py',
+'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': 'SI',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have 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

@@ -11,13 +11,27 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access)': '(インターネットアクセスが必要)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(例: "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\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 +60,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,8 +75,8 @@
 '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',
 'back': '戻る',
 'Back to the plugins list': 'Back to the plugins list',
@@ -87,6 +102,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 +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 view a ticket': 'Click row to view a ticket',
+'Client IP': 'Client IP',
 'code': 'コード',
 'Code listing': 'Code listing',
 'collapse/expand all': '全て開閉する',
@@ -128,7 +146,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 +172,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 +199,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': 'アプリケーションを編集',
@@ -187,11 +207,13 @@
 'Edit current record': 'Edit current record',
 'edit views:': 'ビューの編集:',
 'Editing %s': 'Editing %s',
-'Editing file "%s"': '"%s"ファイルを編集中',
 'Editing Language file': 'Editing Language file',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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,14 +250,15 @@
 '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',
 'GAE Password': 'GAE Password',
 'Generate': 'アプリ生成',
-'Get from URL:': 'URLから取得:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
@@ -243,8 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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 +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': 'インクルード',
+'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 +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': '言語',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': '最終保存日時:',
 'License for': 'License for',
@@ -299,11 +337,14 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'ロードしています...',
 '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 +365,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,14 +389,16 @@
 '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',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
 'OpenShift Output': 'OpenShift Output',
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'or import from csv file',
+'Origin': 'Origin',
 'Original/Translation': 'Original/Translation',
 'Overview': 'Overview',
 'Overwrite installed app': 'アプリケーションを上書き',
@@ -361,7 +406,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 +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)s"プラグインは削除されました',
 'Plugin "%s" in application': '"%s"プラグイン',
@@ -384,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.',
@@ -399,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': 'ルーティング再読み込み',
+'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 +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': 'サイト',
 'Size of cache:': 'Size of cache:',
@@ -460,15 +529,15 @@
 'Start searching': 'Start searching',
 'Start wizard': 'ウィザードの開始',
 'state': 'state',
-'Static': 'Static',
 'static': '静的ファイル',
+'Static': 'Static',
 'Static files': '静的ファイル',
 'Statistics': 'Statistics',
 'Step': 'ステップ',
 'step': 'step',
 'stop': 'stop',
-'submit': 'submit',
 'Submit': 'Submit',
+'submit': 'submit',
 'successful': 'successful',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
@@ -495,7 +564,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 +578,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 +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',
@@ -527,12 +600,12 @@
 'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
 'Unable to download app because:': 'Unable to download app because:',
-'Unable to download because:': '以下の理由でダウンロードできません:',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'unable to parse csv file',
+'Unable to 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': '全ての選択を解除',
@@ -550,12 +623,26 @@
 'upload file:': 'ファイルをアップロード:',
 'upload plugin file:': 'プラグインファイルをアップロード:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
-'user': 'ユーザー',
 'User': 'User',
+'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': 'ビュー',
@@ -570,17 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2pyは最新です',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': '最近のweb2pyTweets',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'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,12 +15,27 @@
 '(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',
 'Accept Terms': 'Accept Terms',
-'Access Control': 'အသုံးပြု ခြင်းဆိုင်ရာ ထိန်းချုပ်ရန်',
 'Add breakpoint': 'Add breakpoint',
 'Additional code for your application': 'Additional code for your application',
 'Admin design page': 'Admin design page',
@@ -31,10 +46,8 @@
 'Admin is disabled because insecure channel': 'Admin is disabled because insecure channel',
 'Admin language': 'Admin language',
 'Admin versioning page': 'Admin versioning page',
-'Administrative Interface': 'စီမံခန့်ခွဲရာ အင်တာဖေ့စ်',
 'administrative interface': 'administrative interface',
 'Administrator Password:': 'Administrator Password:',
-'Ajax Recipes': 'Ajax Recipes',
 'and rename it:': 'and rename it:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
@@ -47,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 yet': 'အသုံးမပြုသေးပါ',
 'Are you sure you want to delete file "%s"?': 'Are you sure you want to delete file "%s"?',
@@ -61,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': 'အသုံးပြုနိုင်သော ဒေတာဘေစ့်များနှင့် ဇယားများ',
 'back': 'back',
@@ -73,7 +88,6 @@
 'breakpoints': 'breakpoints',
 'Bulk Register': 'Bulk Register',
 'Bulk Student Registration': 'Bulk Student Registration',
-'Buy this book': 'ဒီစာအုပ်ကို ဝယ်ပါ',
 'Cache': 'Cache',
 'cache': 'cache',
 'Cache Cleared': 'Cache Cleared',
@@ -88,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',
@@ -98,6 +113,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',
@@ -109,24 +125,19 @@
 'Commit': 'Commit',
 'Commit form': 'Commit form',
 'Committed files': 'Committed files',
-'Community': 'အသိုင်းအဝိုင်း',
 'Compile': 'Compile',
 'Compile (all or nothing)': 'Compile (all or nothing)',
 'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'compiled application removed',
-'Components and Plugins': 'Components and Plugins',
 'Condition': 'Condition',
 'continue': 'continue',
-'Controller': 'ကွန်ထရိုလာ',
 'Controllers': 'ကွန်ထရိုလာများ',
 'controllers': 'controllers',
-'Copyright': 'မူပိုင်ခွင့်',
 'Count': 'Count',
 'Create': 'ဖန်တီးရန်',
 'create file with filename:': 'create file with filename:',
 'Create/Upload': 'Create/Upload',
 'created by': 'ဖန်းတီးသူ',
-'Created By': 'ပြုလုပ်ဖန်တီးသူ',
 'Created by:': 'Created by:',
 'Created On': 'ပြုလုပ်ဖန်တီးသည့်အချိန်',
 'Created on:': 'Created on:',
@@ -144,7 +155,6 @@
 'Database Administration (appadmin)': 'ဒေတာဘေစ့် စီမံခန့်ခွဲခြင်း (appadmin)',
 'Date and Time': 'Date and Time',
 'db': 'db',
-'DB Model': 'DB Model',
 'Debug': 'အမှားရှာရန်',
 'defines tables': 'defines tables',
 'Delete': 'Delete',
@@ -162,7 +172,6 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
-'Deployment Recipes': 'Deployment Recipes',
 'Description': 'ဖော်ပြချက်',
 'Description:': 'Description:',
 'design': 'design',
@@ -182,11 +191,8 @@
 'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'docs',
 'Docs': 'Docs',
-'Documentation': 'စာရွက်စာတမ်း အထောက်အကူများ',
-"Don't know what to do?": 'ဘာလုပ်ရမည်မသိ ဖြစ်နေပါသလား။',
 'done!': 'လုပ်ငန်း ဆောင်ရွက်ပြီးပြီ!',
 'Downgrade': 'Downgrade',
-'Download': 'Download',
 'Download .w2p': 'Download .w2p',
 'Download as .exe': 'Download as .exe',
 'download layouts': 'download layouts',
@@ -205,11 +211,12 @@
 'Editing Plural Forms File': 'Editing Plural Forms File',
 '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',
-'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Error logs for "%(app)s"',
 'Error snapshot': 'Error snapshot',
@@ -227,7 +234,6 @@
 'extends': 'extends',
 'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module because:': 'failed to reload module because:',
-'FAQ': 'ဖြစ်လေ့ရှိသော ပြဿနာများ',
 'File': 'File',
 'file "%(filename)s" created': 'file "%(filename)s" created',
 'file "%(filename)s" deleted': 'file "%(filename)s" deleted',
@@ -246,9 +252,8 @@
 'Find Previous': 'Find Previous',
 'First name': 'အမည်၏ ပထမဆုံး စာလုံး',
 'Form has errors': 'Form has errors',
-'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',
@@ -261,11 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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',
-'Groups': 'အဖွဲ့များ',
-'Hello World': 'မင်္ဂလာပါ ကမ္ဘာကြီး။',
+'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',
@@ -273,7 +279,6 @@
 'Hits': 'Hits',
 'Home': 'မူလသို့',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'How did you get here?': 'သင် ဘယ်လို ရောက်လာခဲ့သလဲ။',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -283,34 +288,41 @@
 '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',
 'internal error: %s': 'internal error: %s',
 'Internal State': 'Internal State',
-'Introduction': 'မိတ်ဆက်',
 'Invalid action': 'Invalid action',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
 'Invalid email': 'အီးမေးလ် ဖြည့်သွင်းမှုမှားနေသည်',
 'Invalid git repository specified.': 'Invalid git repository specified.',
+'Invalid 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',
-'Is Active': 'Is Active',
+'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': 'ဘာသာစကား',
 'language file "%(filename)s" created/updated': 'language file "%(filename)s" created/updated',
 'Language files (static strings) updated': 'Language files (static strings) updated',
 'languages': 'ဘာသာစကားများ',
@@ -318,28 +330,26 @@
 'Last name': 'မျိုးနွယ်အမည်',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Last saved on:',
-'Layout': 'အပြင်အဆင်',
-'Layout Plugins': 'Layout Plugins',
-'Layouts': 'အပြင်အဆင်များ',
 'License for': 'License for',
 'License:': 'License:',
 'Line Nr': 'Line Nr',
 'Line number': 'Line number',
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
-'Live Chat': 'တိုက်ရိုက် ဆက်သွယ် ပြောကြားရန်',
 'Loading...': 'Loading...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'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',
 'Logout': 'ထွက်ရန်',
-'Lost Password': 'စကားဝှက် မသိတော့ပါ',
 'lost password': 'lost password',
-'Lost password?': 'စကားဝှက် မသိတော့ဘူးလား။',
 'Main Menu': 'Main Menu',
 'Manage': 'စီမံခန့်ခွဲရန်',
 'Manage %(action)s': '%(action)s ကို စီမံရန်',
@@ -348,21 +358,19 @@
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Manage Students',
 'Memberships': 'အသင်းဝင်များ',
-'Menu Model': 'Menu Model',
 'merge': 'merge',
 'Models': 'Models',
 'models': 'models',
-'Modified By': 'ပြင်ဆင်မွမ်းမံသူ',
 'Modified On': 'ပြင်ဆင်မွမ်းမံသည့် အချိန်',
 'Modules': 'Modules',
 'modules': 'modules',
 'Multi User Mode': 'Multi User Mode',
-'My Sites': 'ကျွန်ုပ်၏ Site များ',
 'Name': 'အမည်',
 'new application "%s" created': 'new application "%s" created',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
 'New application wizard': 'New application wizard',
+'New password': 'New password',
 'new plugin installed': 'new plugin installed',
 'New plugin installed: %s': 'New plugin installed: %s',
 'New Record': 'မှတ်တမ်း အသစ်',
@@ -382,8 +390,8 @@
 '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',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
 'OpenShift Output': 'OpenShift Output',
@@ -392,8 +400,6 @@
 'or import from csv file': 'or import from csv file',
 'Origin': 'မူလ အစ',
 'Original/Translation': 'Original/Translation',
-'Other Plugins': 'အခြား Plugins',
-'Other Recipes': 'အခြား Recipes',
 'Overview': 'အပေါ်ယံရှုမြင်ခြင်း',
 'Overwrite installed app': 'Overwrite installed app',
 'Pack all': 'အားလုံးကို ထုပ်ပိုးရန်',
@@ -402,7 +408,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.',
@@ -421,12 +430,12 @@
 'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'အားဖြည့်စွမ်းအားပေးသူ',
-'Preface': 'နိဒါန်း',
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
 'Private files': 'Private files',
 'private files': 'private files',
+'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.',
@@ -434,25 +443,31 @@
 'Push': 'Push',
 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
 'pygraphviz library not found': 'pygraphviz library ကို မတွေ့ပါ',
-'Python': 'Python',
 'PythonAnywhere Apps': 'PythonAnywhere Apps',
 'PythonAnywhere Password': 'PythonAnywhere Password',
 'Query:': 'Query:',
-'Quick Examples': 'အမြန် အသုံးပြုနိုင်သော နမူနာများ',
 'RAM': 'RAM',
 'RAM Cache Keys': 'RAM Cache Keys',
 'Ram Cleared': 'Ram ရှင်းလင်းပြီးပြီ',
 'Rapid Search': 'Rapid Search',
-'Recipes': 'Recipes',
 'Record': 'မှတ်တမ်း',
+'Record %(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',
-'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',
@@ -493,8 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'Semantic': 'Semantic',
-'Services': 'Services',
 'session': 'session',
 'session expired': 'session expired',
 'Session saved correctly': 'Session saved correctly',
@@ -502,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:',
@@ -515,18 +529,16 @@
 'Start searching': 'Start searching',
 'Start wizard': 'Start wizard',
 'state': 'state',
-'Static': 'Static',
 'static': 'static',
+'Static': 'Static',
 'Static files': 'Static files',
 'Statistics': 'ကိန်းဂဏန်း အချက်အလက်များ',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'Stylesheet': 'Stylesheet',
-'submit': 'ပြုလုပ်ပါ',
 'Submit': 'Submit',
+'submit': 'ပြုလုပ်ပါ',
 'successful': 'successful',
-'Support': 'အထောက်အပံ့',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
@@ -538,11 +550,8 @@
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'The Core': 'The Core',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
-'The output of the file is a dictionary that was rendered by the view %s': 'The output of the file is a dictionary that was rendered by the view %s',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'The Views': 'The Views',
 'Theme': 'Theme',
 'There are no controllers': 'There are no controllers',
 'There are no models': 'There are no models',
@@ -555,7 +564,7 @@
 'There are no views': 'There are no views',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'This App': 'ဒီ App',
+'This 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',
@@ -582,7 +591,7 @@
 'try something like': 'try something like',
 '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 +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',
@@ -614,16 +624,27 @@
 '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',
 'Verify Password': 'စကားဝှက်ကို အတည်ပြုပါ',
 'Version': 'Version',
 'Versioning': 'Versioning',
-'Videos': 'ဗွီဒီယိုများ',
-'View': 'ဗျူး',
 'Views': 'ဗျူးများ',
 'views': 'views',
 'Warning!': 'Warning!',
@@ -638,23 +659,20 @@
 'web2py online debugger': 'web2py online debugger',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
-'Welcome': 'ကြိုဆိုပါ၏',
-'Welcome to web2py!': 'web2py မှ ကြိုဆိုပါသည်။',
-'Which called the function %s located in the file %s': 'Which called the function %s located in the file %s',
+'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...': 'ဆောင်ရွက်နေပါသည် ။ ။ ။',
 'WSGI reference name': 'WSGI reference name',
 'YES': 'YES',
 'Yes': 'Yes',
-'You are successfully running web2py': 'သင်သည် web2py ကို အောင်မြင်စွာ လည်ပတ်မောင်းနှင်စေပါသည်။',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
-'You can modify this application and adapt it to your needs': 'သင် ဒီ application ကို ပြုပြင်မွမ်းမံနိုင်ပါသည်။ ထို့အပြင် သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီစေရန် ပြုလုပ်နိုင်ပါသည်။',
+'You have 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

@@ -4,24 +4,36 @@
 '!langname!': 'Nederlands',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" is een optionele expressie zoals "veld1=\'nieuwewaarde\'". Je kan de resultaten van een JOIN niet updaten of verwijderen.',
 '"User Exception" debug mode. ': '"Gebruiker Exceptie" debug mode.',
-'"User Exception" debug mode. An error ticket could be issued!': '"Gebruiker Exceptie" debug mode. Een error ticket kan worden aangemaakt!',
 '%s': '%s',
 '%s %%{row} deleted': '%s %%{row} verwijderd',
 '%s %%{row} updated': '%s %%{row} geupdate',
-'%s Recent Tweets': '%s Recente Tweets',
 '%s selected': '%s selected',
 '%s students registered': '%s studenten geregistreerd',
 '%Y-%m-%d': '%Y/%m/%d',
 '%Y-%m-%d %H:%M:%S': '%Y/%m/%d %H:%M:%S',
-'(requires internet access)': '(vereist internettoegang)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(zoiets als "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\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',
 'About application': 'Over applicatie',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Voeg breakpoint toe',
@@ -38,18 +50,17 @@
 'Administrator Password:': 'Administrator Wachtwoord:',
 'and rename it:': 'en hernoem het:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
-'App does not exist or your are not authorized': 'App bestaat niet of je bent niet geautoriseerd',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'appadmin is uitgezet vanwege een onveilig kanaal',
 'Application': 'Application',
 'application "%s" uninstalled': 'applicatie "%s" gedeïnstalleerd',
-'application %(appname)s installed with md5sum: %(digest)s': 'applicatie %(appname)s geïnstalleerd met md5sum: %(digest)s',
 'Application cannot be generated in demo mode': 'Applicatie kan niet gegenereerd worden in demo-mode',
 'application compiled': 'applicatie gecompileerd',
 'Application exists already': 'Application exists already',
 'application is compiled and cannot be designed': 'applicatie is gecompileerd en kan niet worden ontworpen',
 'Application name:': 'Applicatienaam:',
 'Application updated via git pull': 'Application updated via git pull',
+'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,13 +75,12 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'LET OP: Login heeft beveiligde (HTTPS) verbinding nodig of moet draaien op localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'LET OP: TESTEN IS NIET THREAD SAFE EN PROBEER NIET MEERDERE TESTEN TEGELIJK TE DOEN.',
 'ATTENTION: you cannot edit the running application!': 'LET OP: je kan de draaiende applicatie niet bewerken!',
+'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',
 'back': 'terug',
 'Back to the plugins list': 'Back to the plugins list',
 'Back to wizard': 'Back to wizard',
-'bad_resource': 'slechte_resource',
 'Basics': 'Basics',
 'Begin': 'Begin',
 'breakpoint': 'breakpoint',
@@ -92,6 +102,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 +113,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',
@@ -117,16 +130,12 @@
 'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'Gecompileerde applicatie verwijderd',
 'Condition': 'Conditie',
-'contact_admin': 'contact_admin',
 'continue': 'ga door',
 'Controllers': 'Controllers',
 'controllers': 'controllers',
 'Count': 'Count',
 'Create': 'Maak',
-'create': 'maak',
 'create file with filename:': 'maak bestand met naam:',
-'create plural-form': 'maak meervoudsvorm',
-'Create rules': 'Maak regels',
 'Create/Upload': 'Create/Upload',
 'created by': 'gemaakt door:',
 'Created by:': 'Created by:',
@@ -140,9 +149,7 @@
 'currently saved or': 'op het moment opgeslagen of',
 'data uploaded': 'data geupload',
 'Database': 'Database',
-'database': 'database',
 'Database %s select': 'Database %s select',
-'database %s select': 'database %s select',
 'Database administration': 'Database administration',
 'database administration': 'database administratie',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
@@ -165,6 +172,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,23 +199,24 @@
 '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',
-'edit controller': 'bewerk controller',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Bewerk huidige record',
 'edit views:': 'bewerk views:',
 'Editing %s': 'Editing %s',
-'Editing file "%s"': 'Bewerk bestand "%s"',
 'Editing Language file': 'Taalbestand aan het bewerken',
 'Editing Plural Forms File': 'Meervoudsvormenbestand aan het bewerken',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'enter a value': 'geef een waarde',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Error logs voor "%(app)s"',
 'Error snapshot': 'Error snapshot',
@@ -217,7 +226,6 @@
 'Exception %s': 'Exceptie %s',
 'Exception instance attributes': 'Exceptie instantie attributen',
 'Exit Fullscreen': 'Exit Fullscreen',
-'Expand Abbreviation': 'Klap Afkorting uit',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'exporteer als csv-bestand',
 'Exports:': 'Exports:',
@@ -226,7 +234,6 @@
 'extends': 'extends',
 'failed to compile file because:': 'niet gelukt om bestand te compileren omdat:',
 'failed to reload module because:': 'niet gelukt om module te herladen omdat:',
-'faq': 'faq',
 'File': 'Bestand',
 'file "%(filename)s" created': 'bestand "%(filename)s" gemaakt',
 'file "%(filename)s" deleted': 'bestand "%(filename)s" verwijderd',
@@ -243,24 +250,28 @@
 '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',
 'GAE Password': 'GAE Password',
 'Generate': 'Genereer',
-'Get from URL:': 'Krijg van URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
-'Go to Matching Pair': 'Ga naar Matchende Paar',
 'go!': 'ga!',
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Ga naar',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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,14 +288,13 @@
 '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',
-'insert new %s': 'insert new %s',
 'inspect attributes': 'inspecteer attributen',
 'Install': 'Install',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Geïnstalleerde applicaties',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interactie op %s regel %s',
 'Interactive console': 'Interactieve console',
 'internal error': 'interne error',
@@ -292,42 +302,49 @@
 'Internal State': 'Interne State',
 'Invalid action': 'Ongeldige actie',
 'Invalid application name': 'Invalid application name',
-'invalid circual reference': 'ongeldige cirkelreferentie',
 'invalid circular reference': 'Ongeldige circulaire referentie',
+'Invalid 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',
 'License:': 'License:',
 'Line Nr': 'Line Nr',
 'Line number': 'Regelnummer',
-'LineNo': 'RegelNr',
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'laden...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'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',
@@ -340,25 +357,20 @@
 'Manage Admin Users/Students': 'Beheer Admin Gebruikers/Studenten',
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Beheer Studenten',
-'Match Pair': 'Match Pair',
 'Memberships': 'Memberships',
 'merge': 'samenvoegen',
-'Merge Lines': 'Voeg Regels Samen',
-'Minimum length is %s': 'Minimale lengte is %s',
 'Models': 'Modellen',
 'models': 'modellen',
 'Modified On': 'Verandert Op',
 'Modules': 'Modules',
 'modules': 'modules',
 'Multi User Mode': 'Multi User Mode',
-'Must include at least %s %s': 'Moet ten minste bevatten %s %s',
-'Must include at least %s 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',
@@ -366,8 +378,6 @@
 'New simple application': 'Nieuwe eenvoudige applicatie',
 'next': 'volgende',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'volgende 100 rijen',
-'Next Edit Point': 'Volgende Bewerkpunt',
 'NO': 'NEE',
 'no changes': 'no changes',
 'No databases in this application': 'Geen databases in deze applicatie',
@@ -375,19 +385,20 @@
 'no match': 'geen match',
 'no package selected': 'no package selected',
 'no permission to uninstall "%s"': 'geen permissie om "%s" te deïnstalleren',
-'No ticket_storage.txt found under /private folder': 'Geen ticket_storage.txt gevonden onder /private directory',
 'Node:': 'Node:',
 'Not Authorized': 'Geen Rechten',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Notitie: Bij een Github error status code 128, zorg ervoor dat het systeem en het account dat je aan het deployen bent een correspondeerde ssh key geconfigureerd heeft in het openshift account. ',
+'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',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
 'OpenShift Output': 'OpenShift Output',
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'of importeer van csv-bestand',
+'Origin': 'Origin',
 'Original/Translation': 'Oorspronkelijk/Vertaling',
 'Overview': 'Overview',
 'Overwrite installed app': 'Overschrijf geïnstalleerde app',
@@ -395,18 +406,21 @@
 'Pack compiled': 'Pack compiled',
 'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
-'PAM authenticated user, cannot change password here': 'PAM geauthenticeerde gebruiker, kan wachtwoord hier niet wijzigen',
+'Password': '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.',
-'peek': 'gluur',
 'Peeking at file': 'Gluren naar bestand',
 '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',
 'Plugin "%s" in application': 'Plugin "%s" in applicatie',
 'plugin not specified': 'plugin niet gespecialiseerd',
@@ -419,10 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': 'vorige 100 rijen',
-'Previous Edit Point': 'Vorige Bewerkpunt',
 'Private files': 'Privébestanden',
 'private files': 'privébestanden',
+'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.',
@@ -438,22 +451,35 @@
 'Ram Cleared': 'Ram Cleared',
 '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',
-'resolve': 'oplossen',
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': 'Los Conflictbestand op',
 'response': 'antwoord',
 'restart': 'herstart',
@@ -467,16 +493,12 @@
 'Role': 'Role',
 'Roles': 'Roles',
 'Rows in Table': 'Rows in Table',
-'Rows in table': 'Rijen in tabel',
 'Rows selected': 'Rijen geselecteerd',
 'rules are not defined': 'regels zijn niet gedefinieerd',
-'rules parsed with errors': 'regels geparsed met errors',
-'rules:': 'regels:',
 'Run tests': 'Draai testen',
 'Run tests in this file': 'Draai testen in dit bestand',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Draai testen in dit bestand (om alle bestanden te draaien, kun je ook de button genaamd 'test' gebruiken)",
 'Running on %s': 'Draait op %s',
-'runonce': 'runonce',
 'Save': 'Bewaar',
 'Save file:': 'Save file:',
 'Save file: %s': 'Save file: %s',
@@ -484,10 +506,8 @@
 'Save via Ajax': 'Bewaar via Ajax',
 'Saved file hash:': 'Opgeslagen bestandhash:',
 'Screenshot %s': 'Screenshot %s',
-'search': 'zoek',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'Geselecteerd',
 'session': 'sessie',
 'session expired': 'sessie verlopen',
 'Session saved correctly': 'Session saved correctly',
@@ -495,10 +515,8 @@
 'Set Breakpoint on %s at line %s: %s': 'Zet Breakpoint op %s op regel %s: %s',
 'shell': 'shell',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
-'signup': 'signup',
-'signup_requested': 'signup_requested',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Enkelvoudsvorm',
-'site': 'site',
 'Site': 'Site',
 'Size of cache:': 'Size of cache:',
 'skip to generate': 'sla over om te genereren',
@@ -511,22 +529,20 @@
 'Start searching': 'Start searching',
 'Start wizard': 'Start wizard',
 'state': 'state',
-'Static': 'Static',
 'static': 'statisch',
+'Static': 'Static',
 'Static files': 'Statische bestanden',
 'Statistics': 'Statistics',
 'Step': 'Stap',
 'step': 'stap',
 'stop': 'stop',
-'submit': 'submit',
 'Submit': 'Submit',
+'submit': 'submit',
 'successful': 'succesvol',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'tabel',
 'Table': 'Table',
-'tags': 'tags',
 'Temporary': 'tijdelijk',
 'test': 'test',
 'Testing application': 'Applicatie Testen',
@@ -548,21 +564,21 @@
 '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',
 "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.": 'Op deze pagina kan je veranderingen naar een openshift app repo committen en pushen naar je cloud-instantie. Dit gaat er vanuit dat je de applicatie-instantie al gemaakt hebt met de web2py skeleton en de repo ergens op een bestandssysteem hebt waar de web2py-instantie toegang tot heeft. Deze functionaliteit vereist ook een geïnstalleerde GitPython welke beschikbaar is in het python pad van de runtime waar web2py ook in opereert.',
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'Op deze pagina kan je applicatie uploaden naar Google App Engine. Let op, dat je eerst je indexes lokaal aanmaakt. Dit kun je doen door de Google appserver te installeren en de app lokaal eenmaal te draaien, anders krijg je error wanneer je records selecteert. Attentie: deployment kan een lange tijd duren, afhankelijk van de netwerksnelheid. Attentie: het overschrijft je app.yaml. SUBMIT NIET TWEE KEER!',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'deze pagina om te zien of een breakpoint geraakt is en debug-interactie nodig is',
 'This will pull changes from the remote repo for application "%s"?': 'Dit zal veranderingen van de remote repo for applicatie "%s" pullen. ',
 'This will push changes to the remote repo for application "%s".': 'Dit zal veranderingen naar de remote repo for applicatie "%s" pushen. ',
-'ticket': 'ticket',
 'Ticket': 'Ticket',
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
-'tickets': 'tickets',
 'Time in Cache (h:m:s)': 'Tijd in Cache (u:m:s)',
+'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,37 +591,31 @@
 '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.',
 'Unable to check for upgrades': 'Onmogelijk om voor upgrades te checken',
 'unable to create application "%s"': 'onmogelijk om applicatie "%s" te maken',
-'unable to create application "%s" (it may exist already)': 'onmogelijk om applicatie "%s" te maken (mogelijk bestaat deze al)',
 'unable to delete file "%(filename)s"': 'onmogelijk om bestand "%(filename)s" te verwijderen',
 'unable to delete file plugin "%(plugin)s"': 'onmogelijk om pluginbestand "%(plugin)s" te verwijderen',
 'Unable to determine the line number!': 'Onmogelijk om regelnummer te bepalen!',
 'Unable to download app because:': 'Onmogelijk om app the downloaden omdat:',
-'Unable to download because:': 'Onmogelijk om te downloaden omdat:',
 'unable to download layout': 'onmogelijk om layout te downloaden',
 'unable to download plugin: %s': 'onmogelijk om plugin te downloaden: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
-'unable to install application "%(appname)s"': 'onmogelijk om applicatie "%(appname)s" te installeren',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'onmogelijk om csv-bestand te parsen',
+'Unable to 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 ',
 'uncheck all': 'vink alles uit',
-'uninstall': 'deïnstalleer',
 'Uninstall': 'Deïnstalleer',
 'Unsupported webserver working mode: %s': 'Niet ondersteunde webserver werkmodus: %s',
 'update': 'update',
 'update all languages': 'update alle talen',
 'Update:': 'Update:',
 'Upgrade': 'Upgrade',
-'upgrade now': 'upgrade now',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade_web2py': 'upgrade_web2py',
 'upload': 'upload',
 'Upload': 'Upload',
 'Upload a package:': 'Upload een package:',
@@ -613,17 +623,28 @@
 'upload file:': 'upload bestand:',
 'upload plugin file:': 'upload pluginbestand:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Gebruik (...)&(...) voor AND, (...)|(...) voor OR, en ~(...) voor NOT om meer complexe queries te maken.',
-'user': 'gebruiker',
 'User': 'User',
+'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',
-'view': 'view',
 'Views': 'Views',
 'views': 'views',
 'Warning!': 'Warning!',
@@ -636,20 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py is up to date',
 'web2py online debugger': 'web2py online debugger',
-'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',
 'YES': 'JA',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Je kan ook een breakpoint zetten of verwijderen in het bewerkscherm met de Toggle Breakpoint-knop',
-'You can inspect variables using the console bellow': 'Je kan je variabelen inspecteren in de console hieronder',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have 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

@@ -11,20 +11,32 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access)': '(requires internet access)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(coś podobnego do "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\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',
-'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',
+'@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': 'informacje',
 'About application': 'Informacje o aplikacji',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': 'dodatkowy kod Twojej aplikacji',
 'Additional code for your application': 'Additional code for your application',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'panel administracyjny wyłączony z powodu braku hasła administracyjnego',
@@ -32,12 +44,10 @@
 'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'panel administracyjny wyłączony z powodu braku dostępu do pliku z hasłem',
 'Admin is disabled because insecure channel': 'Panel administracyjny wyłączony z powodu braku bezpiecznego połączenia',
-'Admin is disabled because unsecure channel': 'Panel administracyjny wyłączony z powodu braku bezpiecznego połączenia',
 'Admin language': 'Admin language',
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'administrative interface',
 'Administrator Password:': 'Hasło administratora:',
-'and rename it (required):': 'i nadaj jej nową nazwę (wymagane):',
 'and rename it:': 'i nadaj mu nową nazwę:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'administracja aplikacji',
@@ -50,14 +60,13 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': 'Czy na pewno chcesz usunąć wtyczkę "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
-'Are you sure you want to uninstall application "%s"': 'Czy na pewno chcesz usunąć aplikację "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Czy na pewno chcesz usunąć aplikację "%s"?',
-'Are you sure you want to upgrade web2py now?': 'Are you sure you want to upgrade web2py now?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'arguments',
 'at char %s': 'at char %s',
@@ -66,8 +75,8 @@
 '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',
 'back': 'wstecz',
 'Back to the plugins list': 'Back to the plugins list',
@@ -87,13 +96,13 @@
 'can be a git repo': 'can be a git repo',
 'Cancel': 'Cancel',
 'Cannot be empty': 'Nie może być puste',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Nie można skompilować: w Twojej aplikacji są błędy .        Znajdź je, popraw a następnie spróbój ponownie.',
 'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
 'cannot create file': 'nie można utworzyć pliku',
 'cannot upload file "%(filename)s"': 'nie można wysłać pliku "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
 'change editor settings': 'change editor settings',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'zaznacz wszystko',
 'Check for upgrades': 'check for upgrades',
@@ -104,11 +113,10 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
-'click here for online examples': 'kliknij aby przejść do interaktywnych przykładów',
-'click here for the administrative interface': 'kliknij aby przejść do panelu administracyjnego',
+'Click 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',
@@ -128,8 +136,6 @@
 'Count': 'Count',
 'Create': 'create',
 'create file with filename:': 'utwórz plik o nazwie:',
-'create new application:': 'utwórz nową aplikację:',
-'Create new simple application': 'Utwórz nową aplikację',
 'Create/Upload': 'Create/Upload',
 'created by': 'utworzone przez',
 'Created by:': 'Created by:',
@@ -143,9 +149,7 @@
 'currently saved or': 'aktualnie zapisany lub',
 'data uploaded': 'dane wysłane',
 'Database': 'Database',
-'database': 'baza danych',
 'Database %s select': 'Database %s select',
-'database %s select': 'wybór z bazy danych %s',
 'Database administration': 'Database administration',
 'database administration': 'administracja bazy danych',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
@@ -168,10 +172,9 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
+'Description': 'Description',
 'Description:': 'Description:',
 'design': 'projektuj',
-'DESIGN': 'PROJEKTUJ',
-'Design for': 'Projekt dla',
 'Detailed traceback description': 'Detailed traceback description',
 'details': 'details',
 'direction: ltr': 'direction: ltr',
@@ -196,25 +199,24 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
-'EDIT': 'EDYTUJ',
+'E-mail': 'E-mail',
 'Edit': 'edytuj',
 'edit all': 'edit all',
 'Edit application': 'Edycja aplikacji',
-'edit controller': 'edytuj kontroler',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Edytuj aktualny rekord',
 'edit views:': 'edit views:',
 'Editing %s': 'Editing %s',
-'Editing file': 'Edycja pliku',
-'Editing file "%s"': 'Edycja pliku "%s"',
 'Editing Language file': 'Edytuj plik tłumaczeń',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Wpisy błędów dla "%(app)s"',
 'Error snapshot': 'Error snapshot',
@@ -231,13 +233,11 @@
 'exposes:': 'exposes:',
 'extends': 'rozszerza',
 'failed to compile file because:': 'failed to compile file because:',
-'failed to reload module': 'nie udało się przeładować modułu',
 'failed to reload module because:': 'failed to reload module because:',
 'File': 'File',
 'file "%(filename)s" created': 'plik "%(filename)s" został utworzony',
 'file "%(filename)s" deleted': 'plik "%(filename)s" został usunięty',
 'file "%(filename)s" uploaded': 'plik "%(filename)s" został wysłany',
-'file "%(filename)s" was not deleted': 'plik "%(filename)s" nie został usunięty',
 'file "%s" of %s restored': 'plik "%s" z %s został odtworzony',
 'file changed on disk': 'plik na dysku został zmieniony',
 'file does not exist': 'plik nie istnieje',
@@ -250,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.': 'Funkcje bez doctestów będą dołączone do [zaliczonych] testów.',
 'GAE Email': 'GAE Email',
 'GAE Output': 'GAE Output',
@@ -264,9 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
-'Hello World': 'Witaj Świecie',
+'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': 'pomoc',
 'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
@@ -274,7 +279,6 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'edytuj HTML',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -284,13 +288,13 @@
 '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',
 'inspect attributes': 'inspect attributes',
 '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,22 +303,31 @@
 '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',
 'Language files (static strings) updated': 'Pliki tłumaczeń (ciągi statyczne) zostały uaktualnione',
 'languages': 'pliki tłumaczeń',
 'Languages': 'Tłumaczenia',
-'languages updated': 'pliki tłumaczeń zostały uaktualnione',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Ostatnio zapisany:',
 'License for': 'Licencja dla',
@@ -324,12 +337,14 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'wczytywanie...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'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 +365,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',
@@ -361,7 +378,6 @@
 'New simple application': 'New simple application',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'następne 100 wierszy',
 'NO': 'NIE',
 'no changes': 'no changes',
 'No databases in this application': 'Brak baz danych w tej aplikacji',
@@ -373,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',
@@ -380,8 +398,7 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'lub zaimportuj z pliku csv',
-'or provide app url:': 'or provide app url:',
-'or provide application url:': 'lub podaj url aplikacji:',
+'Origin': 'Origin',
 'Original/Translation': 'Oryginał/tłumaczenie',
 'Overview': 'Overview',
 'Overwrite installed app': 'overwrite installed app',
@@ -389,8 +406,12 @@
 'Pack compiled': 'spakuj skompilowane',
 'Pack custom': 'Pack custom',
 'pack plugin': 'spakuj wtyczkę',
-'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
+'Password': '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 +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': 'wtyczka "%(plugin)s" została usunięta',
 'Plugin "%s" in application': 'Wtyczka "%s" w aplikacji',
@@ -411,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': 'poprzednie 100 wierszy',
 'Private files': 'Private files',
 'private files': 'private files',
+'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.',
@@ -429,21 +451,35 @@
 'Ram Cleared': 'Ram Cleared',
 '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',
@@ -456,7 +492,6 @@
 'Revision:': 'Revision:',
 'Role': 'Role',
 'Roles': 'Roles',
-'Rows in table': 'Wiersze w tabeli',
 'Rows in Table': 'Rows in Table',
 'Rows selected': 'Wierszy wybranych',
 'rules are not defined': 'rules are not defined',
@@ -465,7 +500,6 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
 'Save': 'Save',
-'save': 'zapisz',
 'Save file:': 'Save file:',
 'Save file: %s': 'Save file: %s',
 'Save model as...': 'Save model as...',
@@ -474,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'zaznaczone',
 'session': 'session',
 'session expired': 'sesja wygasła',
 'Session saved correctly': 'Session saved correctly',
@@ -482,6 +515,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:',
@@ -495,21 +529,19 @@
 'Start searching': 'Start searching',
 'Start wizard': 'start wizard',
 'state': 'stan',
-'Static': 'Static',
 'static': 'pliki statyczne',
+'Static': 'Static',
 'Static files': 'Pliki statyczne',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'submit': 'wyślij',
 'Submit': 'Submit',
+'submit': 'wyślij',
 'successful': 'successful',
-'Sure you want to delete this object?': 'Czy na pewno chcesz usunąć ten obiekt?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'tabela',
 'Table': 'Table',
 'Temporary': 'Temporary',
 'test': 'testuj',
@@ -517,12 +549,9 @@
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Zapytanie" jest warunkiem postaci "db.tabela1.pole1==\'wartość\'". Takie coś jak "db.tabela1.pole1==db.tabela2.pole2" oznacza SQL JOIN.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'logika aplikacji, każda ścieżka URL jest mapowana na jedną z funkcji eksponowanych w kontrolerze',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'the data representation, define database tables and sets': 'reprezentacja danych, definicje zbiorów i tabel bazy danych',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'the presentations layer, views are also known as templates': 'warstwa prezentacji, widoki zwane są również szablonami',
 'Theme': 'Theme',
 'There are no controllers': 'Brak kontrolerów',
 'There are no models': 'Brak modeli',
@@ -535,11 +564,11 @@
 'There are no views': 'Brak widoków',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'these files are served without processing, your images go here': 'pliki obsługiwane bez interpretacji, to jest miejsce na Twoje obrazy',
+'This 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',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
@@ -549,7 +578,7 @@
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
-'TM': 'TM',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'do  poprzedniej wersji.',
 'To create a plugin, name a file/folder plugin_[name]': 'Aby utworzyć wtyczkę, nazwij plik/katalog plugin_[nazwa]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -558,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
-'translation strings for the application': 'ciągi tłumaczeń dla aplikacji',
 'Translation strings for the application': 'Translation strings for the application',
-'try': 'spróbój',
 'try something like': 'spróbój czegos takiego jak',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'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',
@@ -571,15 +599,13 @@
 'unable to delete file "%(filename)s"': 'nie można usunąć pliku "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'nie można usunąc pliku wtyczki "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': 'Nie można ściągnąć',
-'Unable to download app': 'Nie można ściągnąć aplikacji',
 'Unable to download app because:': 'Unable to download app because:',
-'Unable to download because': 'Unable to download because',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'nie można sparsować pliku csv',
+'Unable to 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',
@@ -590,27 +616,35 @@
 'Update:': 'Uaktualnij:',
 'Upgrade': 'Upgrade',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'upgrade web2py now',
 'upload': 'upload',
 'Upload': 'Upload',
-'Upload & install packed application': 'Upload & install packed application',
 'Upload a package:': 'Upload a package:',
 'Upload and install packed application': 'Upload and install packed application',
-'upload application:': 'wyślij plik aplikacji:',
-'Upload existing application': 'Wyślij istniejącą aplikację',
 'upload file:': 'wyślij plik:',
 'upload plugin file:': 'wyślij plik wtyczki:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Użyj (...)&(...) jako AND, (...)|(...) jako OR oraz ~(...)  jako NOT do tworzenia bardziej skomplikowanych zapytań.',
-'Use an url:': 'Use an url:',
 'User': 'User',
+'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',
-'view': 'widok',
 'Views': 'Widoki',
 'views': 'widoki',
 'Warning!': 'Warning!',
@@ -623,18 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py jest aktualne',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'najnowsze tweety web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
-'Welcome to web2py': 'Witaj w web2py',
+'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': 'TAK',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have 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,16 +15,28 @@
 '(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',
-'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',
+'@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': 'sobre',
 'About application': 'Sobre a aplicação',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': 'código adicional para sua aplicação',
 'Additional code for your application': 'Código adicional para sua aplicação',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': ' admin desabilitado por falta de senha definida',
@@ -32,12 +44,10 @@
 'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'admin desabilitado porque não foi possível ler o arquivo de senha',
 'Admin is disabled because insecure channel': 'Admin desabilitado pois o canal não é seguro',
-'Admin is disabled because unsecure channel': 'Admin desabilitado pois o canal não é seguro',
 'Admin language': 'Idioma do Admin',
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'interface administrativa',
 'Administrator Password:': 'Senha de administrador:',
-'and rename it (required):': 'e renomeie (requerido):',
 'and rename it:': ' e renomeie:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
@@ -50,14 +60,13 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': 'Tem certeza que deseja apagar o plugin "%s"?',
 'Are you sure you want to delete this object?': 'Tem certeza que deseja apagar esse objeto?',
-'Are you sure you want to uninstall application "%s"': 'Tem certeza que deseja desinstalar a aplicação "%s"?',
 'Are you sure you want to uninstall application "%s"?': 'Tem certeza que deseja desinstalar a aplicação "%s"?',
-'Are you sure you want to upgrade web2py now?': 'Tem certeza que deseja atualizar o web2py agora?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'argumentos',
 'at char %s': 'at char %s',
@@ -66,8 +75,8 @@
 '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',
 'back': 'voltar',
 'Back to the plugins list': 'Back to the plugins list',
@@ -77,7 +86,6 @@
 'breakpoint': 'breakpoint',
 'Breakpoints': 'Breakpoints',
 'breakpoints': 'breakpoints',
-'browse': 'navegar',
 'Bulk Register': 'Bulk Register',
 'Bulk Student Registration': 'Bulk Student Registration',
 'Cache': 'Cache',
@@ -88,14 +96,13 @@
 'can be a git repo': 'pode ser um repositório git',
 'Cancel': 'Cancel',
 'Cannot be empty': 'Não pode ser vazio',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Não é possível compilar: Existem erros em sua aplicação.       Depure, corrija os errros e tente novamente',
 'Cannot compile: there are errors in your app:': 'Não é possível compilar: Existem erros em sua aplicação',
 'cannot create file': 'Não é possível criar o arquivo',
 'cannot upload file "%(filename)s"': 'não é possível fazer upload do arquivo "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'mudar senha de administrador',
 'change editor settings': 'change editor settings',
-'Change Password': 'Mudar Senha',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'marcar todos',
 'Check for upgrades': 'Verificar se existem atualizações',
@@ -106,12 +113,9 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
-'click here for online examples': 'clique para ver exemplos online',
-'click here for the administrative interface': 'Clique aqui para acessar a interface administrativa',
+'Click 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',
-'click to open': 'clique para abrir',
 'Client IP': 'IP do cliente',
 'code': 'código',
 'Code listing': 'Code listing',
@@ -119,7 +123,6 @@
 'Command': 'Command',
 'Comment:': 'Comment:',
 'Commit': 'Commit',
-'commit (mercurial)': 'commit (mercurial)',
 'Commit form': 'Commit form',
 'Committed files': 'Committed files',
 'Compile': 'Compilar',
@@ -133,9 +136,6 @@
 'Count': 'Contagem',
 'Create': 'Criar',
 'create file with filename:': 'criar um arquivo com o nome:',
-'Create new application using the Wizard': 'Criar nova aplicação utilizando o Assistente',
-'create new application:': 'nome da nova aplicação:',
-'Create new simple application': 'Crie uma nova aplicação',
 'Create/Upload': 'Create/Upload',
 'created by': 'criado por',
 'Created by:': 'Created by:',
@@ -147,12 +147,9 @@
 'Current session': 'Sessão atual',
 'currently running': 'Executando',
 'currently saved or': 'Atualmente salvo ou',
-'customize me!': 'Modifique-me!',
 'data uploaded': 'Dados enviados',
 'Database': 'Database',
-'database': 'banco de dados',
 'Database %s select': 'Database %s select',
-'database %s select': 'Select no banco de dados %s',
 'Database administration': 'Database administration',
 'database administration': 'administração do banco de dados',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
@@ -178,8 +175,6 @@
 'Description': 'Descrição',
 'Description:': 'Description:',
 'design': 'projeto',
-'DESIGN': 'Projeto',
-'Design for': 'Projeto de',
 'Detailed traceback description': 'Descrição detalhada do traceback',
 'details': 'details',
 'direction: ltr': 'direção: ltr',
@@ -205,26 +200,23 @@
 'download plugins': 'download de plugins',
 'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'E-mail',
-'EDIT': 'EDITAR',
 'Edit': 'Editar',
 'edit all': 'editar todos',
 'Edit application': 'Editar aplicação',
-'edit controller': 'editar controlador',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Editar o registro atual',
-'Edit Profile': 'Editar Perfil',
 'edit views:': 'editar visões:',
 'Editing %s': 'Editing %s',
-'Editing file': 'Editando arquivo',
-'Editing file "%s"': 'Editando arquivo "%s"',
 'Editing Language file': 'Editando arquivo de idioma',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'Enterprise Web Framework': 'Framework Web Corporativo',
 'Error': 'Erro',
 'Error logs for "%(app)s"': 'Logs de erro para "%(app)s"',
 'Error snapshot': 'Momento do Erro',
@@ -241,13 +233,11 @@
 'exposes:': 'exposes:',
 'extends': 'estende',
 'failed to compile file because:': 'failed to compile file because:',
-'failed to reload module': 'Falha ao recarregar o módulo',
 'failed to reload module because:': 'falha ao recarregar o módulo porque:',
 'File': 'Arquivo',
 'file "%(filename)s" created': 'arquivo "%(filename)s" criado',
 'file "%(filename)s" deleted': 'arquivo "%(filename)s" apagado',
 'file "%(filename)s" uploaded': 'arquivo "%(filename)s" enviado',
-'file "%(filename)s" was not deleted': 'arquivo "%(filename)s" não foi apagado',
 'file "%s" of %s restored': 'arquivo "%s" de %s restaurado',
 'file changed on disk': 'arquivo modificado no disco',
 'file does not exist': 'arquivo não existe',
@@ -263,6 +253,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',
@@ -275,10 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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',
-'Hello World': 'Olá Mundo',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'Ajuda',
 'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
@@ -286,7 +279,6 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'htmledit',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -296,13 +288,13 @@
 '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',
 'inspect attributes': 'inspeciona atributos',
 'Install': 'instalar',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Aplicações instaladas',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'erro interno',
@@ -313,21 +305,28 @@
 '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',
 'Language files (static strings) updated': 'Arquivos de idioma (textos estáticos) atualizados',
 'languages': 'idiomas',
 'Languages': 'Idiomas',
-'languages updated': 'idiomas atualizados',
 'Last name': 'Sobrenome',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Salvo pela última vez em:',
@@ -338,21 +337,21 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'carregando...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
-'login': 'início de sessão',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 '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',
 'Logout': 'finalizar sessão',
-'Lost Password': 'Perdi a senha',
 'lost password': 'lost password',
 'Main Menu': 'Main Menu',
 'Manage': 'Gerenciar',
-'manage': 'gerenciar',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
 'Manage Admin Users/Students': 'Manage Admin Users/Students',
@@ -360,8 +359,8 @@
 'Manage Students': 'Manage Students',
 'Memberships': 'Memberships',
 'merge': 'juntar',
-'models': 'modelos',
 'Models': 'Modelos',
+'models': 'modelos',
 'Modified On': 'Modified On',
 'Modules': 'Módulos',
 'modules': 'módulos',
@@ -371,6 +370,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',
@@ -378,7 +378,6 @@
 'New simple application': 'Nova aplicação básica',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'próximos 100 registros',
 'NO': 'NÃO',
 'no changes': 'no changes',
 'No databases in this application': 'Não existem bancos de dados nesta aplicação',
@@ -390,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',
@@ -397,8 +398,6 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Ou baixa da URL:',
 'or import from csv file': 'ou importar de um arquivo CSV',
-'or provide app url:': 'ou forneça a url de uma aplicação:',
-'or provide application url:': 'ou forneça a url de uma aplicação:',
 'Origin': 'Origem',
 'Original/Translation': 'Original/Tradução',
 'Overview': 'Overview',
@@ -407,9 +406,12 @@
 'Pack compiled': 'Criar pacote compilado',
 'Pack custom': 'Customizar pacote',
 'pack plugin': 'empacotar plugin',
-'PAM authenticated user, cannot change password here': 'usuário autenticado por PAM não pode alterar a senha aqui',
 'Password': 'Senha',
 'password changed': 'senha alterada',
+'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 +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" apagado',
 'Plugin "%s" in application': 'Plugin "%s" na aplicação',
@@ -430,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': '100 registros anteriores',
 'Private files': 'Private files',
 'private files': 'private files',
+'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,24 +451,35 @@
 'Ram Cleared': 'Ram Cleared',
 '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 ID': 'ID do Registro',
+'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',
@@ -478,7 +492,6 @@
 'Revision:': 'Revision:',
 'Role': 'Papel',
 'Roles': 'Roles',
-'Rows in table': 'Registros na tabela',
 'Rows in Table': 'Rows in Table',
 'Rows selected': 'Registros selecionados',
 'rules are not defined': 'rules are not defined',
@@ -487,7 +500,6 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Rodando em %s',
 'Save': 'Save',
-'save': 'salvar',
 'Save file:': 'Save file:',
 'Save file: %s': 'Save file: %s',
 'Save model as...': 'Save model as...',
@@ -496,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Selecione arquivos para empacotar',
-'selected': 'selecionado(s)',
 'session': 'session',
 'session expired': 'sessão expirada',
 'Session saved correctly': 'Session saved correctly',
@@ -504,6 +515,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:',
@@ -517,35 +529,29 @@
 'Start searching': 'Start searching',
 'Start wizard': 'Iniciar assistente',
 'state': 'estado',
-'Static': 'Static',
 'static': 'estáticos',
+'Static': 'Static',
 'Static files': 'Arquivos estáticos',
 'Statistics': 'Statistics',
 'Step': 'Passo',
 'step': 'step',
 'stop': 'stop',
-'submit': 'enviar',
 'Submit': 'Enviar',
+'submit': 'enviar',
 'successful': 'successful',
-'Sure you want to delete this object?': 'Tem certeza que deseja apagar este objeto?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'tabela',
 'Table': 'Table',
-'Table name': 'Nome da tabela',
 'Temporary': 'Temporary',
 'test': 'testar',
 'Testing application': 'Testando a aplicação',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'A "consulta" é uma condição como "db.tabela.campo1==\'valor\'". Algo como "db.tabela1.campo1==db.tabela2.campo2" resulta em um JOIN SQL.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'A lógica da aplicação, cada URL é mapeada para uma função exposta pelo controlador',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'A lógica da aplicação, cada URL é mapeada para uma função exposta pelo controlador',
-'the data representation, define database tables and sets': 'A representação dos dados, define tabelas do banco de dados e conjuntos',
 'The data representation, define database tables and sets': 'A representação dos dados, define tabelas do banco de dados e conjuntos',
 'The presentations layer, views are also known as templates': 'A camada de apresentação, as visões também são chamadas de templates',
-'the presentations layer, views are also known as templates': 'A camada de apresentação, as visões também são chamadas de templates',
 'Theme': 'Theme',
 'There are no controllers': 'Não existem controladores',
 'There are no models': 'Não existem modelos',
@@ -558,11 +564,11 @@
 'There are no views': 'Não existem visões',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'Estes arquivos são servidos sem processamento, suas imagens ficam aqui',
-'these files are served without processing, your images go here': 'Estes arquivos são servidos sem processamento, suas imagens ficam aqui',
+'This 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',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
@@ -573,7 +579,6 @@
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': 'Momento de geração',
-'TM': 'MR',
 'to  previous version.': 'para a versão anterior.',
 'To create a plugin, name a file/folder plugin_[name]': 'Para criar um plugin, nomeie um arquivo/pasta como plugin_[nome]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -582,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
-'translation strings for the application': 'textos traduzidos para a aplicação',
 'Translation strings for the application': 'textos traduzidos para a aplicação',
-'try': 'tente',
 'try something like': 'tente algo como',
 'Try the mobile interface': 'Experimente a interface para smartphones e tablets',
 'try view': 'try view',
+'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',
@@ -595,15 +599,13 @@
 'unable to delete file "%(filename)s"': 'não é possível criar o arquivo "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'não é possível criar o plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': 'Não é possível efetuar o download',
-'Unable to download app': 'Não é possível baixar a aplicação',
 'Unable to download app because:': 'Não é possível baixar a aplicação porque:',
-'Unable to download because': 'Não é possível baixar porque',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'não é possível analisar o arquivo CSV',
+'Unable to 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',
@@ -614,27 +616,35 @@
 'Update:': 'Alterar:',
 'Upgrade': 'Upgrade',
 'upgrade now to %s': 'Atualize agora para %s',
-'upgrade web2py now': 'atualize o web2py agora',
 'upload': 'upload',
 'Upload': 'Upload',
 'Upload a package:': 'Faça upload de um pacote:',
 'Upload and install packed application': 'Faça upload e instale uma aplicação empacotada',
-'upload application:': 'Fazer upload de uma aplicação:',
-'Upload existing application': 'Faça upload de uma aplicação existente',
 'upload file:': 'Enviar arquivo:',
 'upload plugin file:': 'Enviar arquivo de plugin:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, e ~(...) para NOT, para criar consultas mais complexas.',
-'Use an url:': 'Use uma url:',
 'User': 'User',
+'User %(id)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',
-'view': 'visão',
 'Views': 'Visões',
 'views': 'visões',
 'Warning!': 'Warning!',
@@ -647,18 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py está atualizado',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'Tweets Recentes de @web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py atualizado; favor reiniciar',
-'Welcome to web2py': 'Bem-vindo ao web2py',
+'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': 'SIM',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have 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

@@ -11,22 +11,32 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%d/%m/%Y',
 '%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
-'(requires internet access)': '(requer acesso à internet)',
 '(requires internet access, experimental)': '(requer acesso à internet, experimental)',
 '(something like "it-it")': '(algo como "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.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',
-'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',
+'@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': 'sobre',
 'About application': 'Sobre a aplicação',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': 'código adicional para sua aplicação',
 'Additional code for your application': 'Código adicional para a sua aplicação',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': ' admin desabilitado por falta de senha definida',
@@ -34,12 +44,10 @@
 'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'admin desabilitado, não foi possível ler o arquivo de senha',
 'Admin is disabled because insecure channel': 'Admin desabilitado pois o canal não é seguro',
-'Admin is disabled because unsecure channel': 'Admin desabilitado pois o canal não é seguro',
 'Admin language': 'Linguagem do Admin',
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'interface administrativa',
 'Administrator Password:': 'Senha de administrador:',
-'and rename it (required):': 'e renomeie (requerido):',
 'and rename it:': ' e renomeie:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
@@ -52,14 +60,13 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': 'Tem certeza que deseja apagar o plugin "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
-'Are you sure you want to uninstall application "%s"': 'Tem certeza que deseja apagar a aplicação "%s"?',
 'Are you sure you want to uninstall application "%s"?': 'Tem certeza que deseja apagar a aplicação "%s"?',
-'Are you sure you want to upgrade web2py now?': 'Tem certeza que deseja atualizar o web2py agora?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'argumentos',
 'at char %s': 'at char %s',
@@ -68,8 +75,8 @@
 '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',
 'back': 'voltar',
 'Back to the plugins list': 'Back to the plugins list',
@@ -79,7 +86,6 @@
 'breakpoint': 'breakpoint',
 'Breakpoints': 'Breakpoints',
 'breakpoints': 'breakpoints',
-'browse': 'buscar',
 'Bulk Register': 'Bulk Register',
 'Bulk Student Registration': 'Bulk Student Registration',
 'Cache': 'Cache',
@@ -90,14 +96,13 @@
 'can be a git repo': 'can be a git repo',
 'Cancel': 'Cancel',
 'Cannot be empty': 'Não pode ser vazio',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Não é possível compilar: Existem erros em sua aplicação.       Depure, corrija os errros e tente novamente',
 'Cannot compile: there are errors in your app:': 'Não é possível compilar: Existem erros em sua aplicação',
 'cannot create file': 'Não é possível criar o arquivo',
 'cannot upload file "%(filename)s"': 'não é possível fazer upload do arquivo "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'mudar senha de administrador',
 'change editor settings': 'mudar definições do editor',
-'Change Password': 'Trocar Senha',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'marcar todos',
 'Check for upgrades': 'checar por atualizações',
@@ -108,12 +113,9 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
-'click here for online examples': 'clique para ver exemplos online',
-'click here for the administrative interface': 'Clique aqui para acessar a interface administrativa',
+'Click 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',
-'click to open': 'clique para abrir',
 'Client IP': 'IP do cliente',
 'code': 'código',
 'Code listing': 'Code listing',
@@ -121,7 +123,6 @@
 'Command': 'Command',
 'Comment:': 'Comment:',
 'Commit': 'Commit',
-'commit (mercurial)': 'commit (mercurial)',
 'Commit form': 'Commit form',
 'Committed files': 'Committed files',
 'Compile': 'compilar',
@@ -135,9 +136,6 @@
 'Count': 'Contagem',
 'Create': 'criar',
 'create file with filename:': 'criar um arquivo com o nome:',
-'Create new application using the Wizard': 'Criar nova aplicação utilizando o assistente',
-'create new application:': 'nome da nova aplicação:',
-'Create new simple application': 'Crie uma nova aplicação',
 'Create/Upload': 'Create/Upload',
 'created by': 'criado por',
 'Created by:': 'Created by:',
@@ -149,12 +147,9 @@
 'Current session': 'Sessão atual',
 'currently running': 'Executando',
 'currently saved or': 'Atualmente salvo ou',
-'customize me!': 'Modifique-me',
 'data uploaded': 'Dados enviados',
 'Database': 'Database',
-'database': 'banco de dados',
 'Database %s select': 'Database %s select',
-'database %s select': 'Seleção no banco de dados %s',
 'Database administration': 'Database administration',
 'database administration': 'administração de banco de dados',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
@@ -180,8 +175,6 @@
 'Description': 'Descrição',
 'Description:': 'Description:',
 'design': 'modificar',
-'DESIGN': 'Projeto',
-'Design for': 'Projeto de',
 'Detailed traceback description': 'Detailed traceback description',
 'details': 'details',
 'direction: ltr': 'direção: ltr',
@@ -207,26 +200,23 @@
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'E-mail',
-'EDIT': 'EDITAR',
 'Edit': 'editar',
 'edit all': 'edit all',
 'Edit application': 'Editar aplicação',
-'edit controller': 'editar controlador',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Editar o registro atual',
-'Edit Profile': 'Editar Perfil',
 'edit views:': 'editar visões:',
 'Editing %s': 'A Editar %s',
-'Editing file': 'Editando arquivo',
-'Editing file "%s"': 'Editando arquivo "%s"',
 'Editing Language file': 'Editando arquivo de linguagem',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'Enterprise Web Framework': 'Framework web empresarial',
 'Error': 'Erro',
 'Error logs for "%(app)s"': 'Logs de erro para "%(app)s"',
 'Error snapshot': 'Error snapshot',
@@ -243,13 +233,11 @@
 'exposes:': 'exposes:',
 'extends': 'estende',
 'failed to compile file because:': 'failed to compile file because:',
-'failed to reload module': 'Falha ao recarregar o módulo',
 'failed to reload module because:': 'falha ao recarregar o módulo por:',
 'File': 'Arquivo',
 'file "%(filename)s" created': 'arquivo "%(filename)s" criado',
 'file "%(filename)s" deleted': 'arquivo "%(filename)s" apagado',
 'file "%(filename)s" uploaded': 'arquivo "%(filename)s" enviado',
-'file "%(filename)s" was not deleted': 'arquivo "%(filename)s" não foi apagado',
 'file "%s" of %s restored': 'arquivo "%s" de %s restaurado',
 'file changed on disk': 'arquivo modificado no disco',
 'file does not exist': 'arquivo não existe',
@@ -265,6 +253,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,10 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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',
-'Hello World': 'Olá Mundo',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'ajuda',
 'here': 'here',
 'Hide/Show Translated strings': '',
@@ -288,7 +279,6 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'htmledit',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -298,13 +288,13 @@
 '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',
 'inspect attributes': 'inspecionar atributos',
 'Install': 'instalar',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Aplicações instaladas',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'erro interno',
@@ -315,21 +305,28 @@
 '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',
 'Language files (static strings) updated': 'Arquivos de linguagem (textos estáticos) atualizados',
 'languages': 'linguagens',
 'Languages': 'Linguagens',
-'languages updated': 'linguagens atualizadas',
 'Last name': 'Sobrenome',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Salvo em:',
@@ -340,21 +337,21 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'carregando...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
-'login': 'inicio de sessão',
+'Log In': 'Log In',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 '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',
 'Logout': 'finalizar sessão',
-'Lost Password': 'Senha perdida',
 'lost password': 'lost password',
 'Main Menu': 'Main Menu',
 'Manage': 'Manage',
-'manage': 'gerenciar',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
 'Manage Admin Users/Students': 'Manage Admin Users/Students',
@@ -362,8 +359,8 @@
 'Manage Students': 'Manage Students',
 'Memberships': 'Memberships',
 'merge': 'juntar',
-'models': 'modelos',
 'Models': 'Modelos',
+'models': 'modelos',
 'Modified On': 'Modified On',
 'Modules': 'Módulos',
 'modules': 'módulos',
@@ -373,6 +370,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',
@@ -380,7 +378,6 @@
 'New simple application': 'Nova aplicação básica',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'próximos 100 registros',
 'NO': 'NÃO',
 'no changes': 'no changes',
 'No databases in this application': 'Não existem bancos de dados nesta aplicação',
@@ -388,21 +385,19 @@
 'no match': 'não encontrado',
 'no package selected': 'nenhum pacote selecionado',
 'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
-'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
 'Node:': 'Node:',
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'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',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
 'OpenShift Output': 'OpenShift Output',
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Ou Obtenha do URL:',
 'or import from csv file': 'ou importar de um arquivo CSV',
-'or provide app url:': 'ou forneça a url de uma aplicação:',
-'or provide application url:': 'ou forneça a url de uma aplicação:',
 'Origin': 'Origem',
 'Original/Translation': 'Original/Tradução',
 'Overview': 'Overview',
@@ -411,9 +406,12 @@
 'Pack compiled': 'criar pacote compilado',
 'Pack custom': 'Pack custom',
 'pack plugin': 'empacotar plugin',
-'PAM authenticated user, cannot change password here': 'usuario autenticado por PAM, não pode alterar a senha por aqui',
 'Password': 'Senha',
 'password changed': 'senha alterada',
+'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 +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" eliminado',
 'Plugin "%s" in application': 'Plugin "%s" na aplicação',
@@ -434,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': '100 registros anteriores',
 'Private files': 'Private files',
 'private files': 'private files',
+'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.',
@@ -451,26 +450,36 @@
 'RAM Cache Keys': 'RAM Cache Keys',
 'Ram Cleared': 'Ram Cleared',
 'Rapid Search': 'Rapid Search',
-'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 ID': 'ID do Registro',
+'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',
@@ -483,7 +492,6 @@
 'Revision:': 'Revision:',
 'Role': 'Papel',
 'Roles': 'Roles',
-'Rows in table': 'Registros na tabela',
 'Rows in Table': 'Rows in Table',
 'Rows selected': 'Registros selecionados',
 'rules are not defined': 'rules are not defined',
@@ -492,7 +500,6 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'A correr em %s',
 'Save': 'Save',
-'save': 'salvar',
 'Save file:': 'Gravar ficheiro:',
 'Save file: %s': 'Gravar ficheiro: %s',
 'Save model as...': 'Save model as...',
@@ -501,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'selecionado(s)',
 'session': 'session',
 'session expired': 'sessão expirada',
 'Session saved correctly': 'Session saved correctly',
@@ -509,6 +515,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:',
@@ -522,35 +529,29 @@
 'Start searching': 'Start searching',
 'Start wizard': 'iniciar assistente',
 'state': 'estado',
-'Static': 'Static',
 'static': 'estáticos',
+'Static': 'Static',
 'Static files': 'Arquivos estáticos',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'submit': 'enviar',
 'Submit': 'Submit',
+'submit': 'enviar',
 'successful': 'successful',
-'Sure you want to delete this object?': 'Tem certeza que deseja apaagr este objeto?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'tabela',
 'Table': 'Table',
-'Table name': 'Nome da tabela',
 'Temporary': 'Temporary',
 'test': 'testar',
 'Testing application': 'Testando a aplicação',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'A "consulta" é uma condição como "db.tabela.campo1==\'valor\'". Algo como "db.tabela1.campo1==db.tabela2.campo2" resulta em um JOIN SQL.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'A lógica da aplicação, cada URL é mapeada para uma função exposta pelo controlador',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'the data representation, define database tables and sets': 'A representação dos dadps, define tabelas e estruturas de dados',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'the presentations layer, views are also known as templates': 'A camada de apresentação, As visões também são chamadas de templates',
 'Theme': 'Theme',
 'There are no controllers': 'Não existem controllers',
 'There are no models': 'Não existem modelos',
@@ -563,11 +564,11 @@
 'There are no views': 'Não existem visões',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'these files are served without processing, your images go here': 'Estes arquivos são servidos sem processamento, suas imagens ficam aqui',
+'This 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',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
@@ -578,7 +579,6 @@
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': 'Data Atual',
-'TM': 'MR',
 'to  previous version.': 'para a versão anterior.',
 'To create a plugin, name a file/folder plugin_[name]': 'Para criar um plugin, nomeio um arquivo/pasta como plugin_[nome]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -587,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
-'translation strings for the application': 'textos traduzidos para a aplicação',
 'Translation strings for the application': 'Translation strings for the application',
-'try': 'tente',
 'try something like': 'tente algo como',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'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',
@@ -600,15 +599,13 @@
 'unable to delete file "%(filename)s"': 'não é possível criar o arquico "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'não é possível criar o plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': 'Não é possível efetuar o download',
-'Unable to download app': 'Não é possível baixar a aplicação',
 'Unable to download app because:': 'Não é possível baixar a aplicação porque:',
-'Unable to download because': 'Não é possível baixar porque',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'não é possível analisar o arquivo CSV',
+'Unable to 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',
@@ -619,28 +616,35 @@
 'Update:': 'Atualizar:',
 'Upgrade': 'Upgrade',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'atualize o web2py agora',
 'upload': 'upload',
 'Upload': 'Upload',
-'Upload & install packed application': 'Faça upload e instale uma aplicação empacotada',
 'Upload a package:': 'Faça upload de um pacote:',
 'Upload and install packed application': 'Upload and install packed application',
-'upload application:': 'Fazer upload de uma aplicação:',
-'Upload existing application': 'Faça upload de uma aplicação existente',
 'upload file:': 'Enviar arquivo:',
 'upload plugin file:': 'Enviar arquivo de plugin:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, y ~(...) para NOT, para criar consultas mais complexas.',
-'Use an url:': 'Use uma url:',
 'User': 'User',
+'User %(id)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',
-'view': 'visão',
 'Views': 'Visões',
 'views': 'visões',
 'Warning!': 'Warning!',
@@ -653,18 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py está atualizado',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'Tweets Recentes de @web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py atualizado; favor reiniciar',
-'Welcome to web2py': 'Bem-vindo ao web2py',
+'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': 'SIM',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have 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

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 {
-'!=': '!=',
 '!langcode!': 'ro',
 '!langname!': 'Română',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" (actualizează) este o expresie opțională precum "câmp1=\'valoare_nouă\'". Nu puteți actualiza sau șterge rezultatele unui JOIN',
 '"User Exception" debug mode. ': '"User Exception" debug mode. ',
-'%(nrows)s records found': '%(nrows)s înregistrări găsite',
 '%s': '%s',
 '%s %%{row} deleted': '%s linii șterse',
 '%s %%{row} updated': '%s linii actualizate',
@@ -13,28 +11,32 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access)': '(are nevoie de acces internet)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(ceva ce seamănă cu "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}': 'Căutare: **%s** fișiere',
-'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',
+'@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': 'Anulează',
 'About': 'Despre',
-'about': 'despre',
 'About application': 'Despre aplicație',
 'Accept Terms': 'Accept Terms',
-'Access Control': 'Control acces',
-'Add': 'Adaugă',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': 'cod suplimentar pentru aplicația dvs.',
 'Additional code for your application': 'Cod suplimentar pentru aplicație',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'administrare dezactivată deoarece parola de administrator nu a fost furnizată',
@@ -42,16 +44,10 @@
 'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'administrare dezactivată deoarece nu există acces la fișierul cu parole',
 'Admin is disabled because insecure channel': 'Adminstrarea este dezactivată deoarece conexiunea nu este sigură',
-'Admin is disabled because unsecure channel': 'Administrarea este dezactivată deoarece conexiunea nu este securizată',
 'Admin language': 'Limba de administrare',
 'Admin versioning page': 'Admin versioning page',
-'Administration': 'Administrare',
 'administrative interface': 'interfață de administrare',
-'Administrative Interface': 'Interfață administrare',
 'Administrator Password:': 'Parolă administrator:',
-'Ajax Recipes': 'Rețete Ajax',
-'And': 'Și',
-'and rename it (required):': 'și renumește (obligatoriu):',
 'and rename it:': ' și renumește:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
@@ -64,12 +60,12 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
 'Are you sure you want to delete this object?': 'Sigur ștergeți acest obiect?',
-'Are you sure you want to uninstall application "%s"': 'Sigur dezinstalați aplicația "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Sigur dezinstalați aplicația "%s"?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'argumente',
@@ -79,11 +75,9 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENȚIE: Nu vă puteți conecta decât utilizând o conexiune securizată (HTTPS) sau rulând aplicația pe computerul local.',
 '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',
-'Back': 'Înapoi',
 'back': 'înapoi',
 'Back to the plugins list': 'Back to the plugins list',
 'Back to wizard': 'Back to wizard',
@@ -94,7 +88,6 @@
 'breakpoints': 'breakpoints',
 'Bulk Register': 'Bulk Register',
 'Bulk Student Registration': 'Bulk Student Registration',
-'Buy this book': 'Cumpără această carte',
 'Cache': 'Cache',
 'cache': 'cache',
 'Cache Cleared': 'Cache Cleared',
@@ -103,30 +96,26 @@
 'can be a git repo': 'can be a git repo',
 'Cancel': 'Cancel',
 'Cannot be empty': 'Nu poate fi vid',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Compilare imposibilă: aplicația conține erori. Debogați aplicația și încercați din nou.',
 'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
 'cannot create file': 'fișier imposibil de creat',
 'cannot upload file "%(filename)s"': 'imposibil de încărcat fișierul "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Schimbă parola de administrare',
 'change editor settings': 'change editor settings',
-'Change Password': 'Schimbare parolă',
 'Change password': 'Schimbare parolă',
-'change password': 'schimbare parolă',
 'Changelog': 'Changelog',
 'check all': 'coșează tot',
 'Check for upgrades': 'Verifică dacă există upgrade-uri',
 'Check to delete': 'Coșați pentru a șterge',
 'Checking for upgrades...': 'Verifică dacă există actualizări...',
-'clean': 'golire',
 'Clean': 'Curăță',
 'Clear': 'Golește',
 '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',
 'Client IP': 'IP client',
 'code': 'code',
 'Code listing': 'Code listing',
@@ -136,25 +125,17 @@
 'Commit': 'Commit',
 'Commit form': 'Commit form',
 'Committed files': 'Committed files',
-'Community': 'Comunitate',
 'Compile': 'Compilează',
-'compile': 'compilare',
 'Compile (all or nothing)': 'Compile (all or nothing)',
 'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'aplicația compilată a fost ștearsă',
-'Components and Plugins': 'Componente și plugin-uri',
 'Condition': 'Condition',
-'contains': 'conține',
 'continue': 'continue',
-'Controller': 'Controlor',
 'Controllers': 'Controlori',
 'controllers': 'controlori',
-'Copyright': 'Drepturi de autor',
 'Count': 'Număr',
 'Create': 'Crează',
 'create file with filename:': 'crează fișier cu numele:',
-'Create new application': 'Creați aplicație nouă',
-'create new application:': 'crează aplicație nouă:',
 'Create/Upload': 'Create/Upload',
 'created by': 'creat de',
 'Created by:': 'Created by:',
@@ -166,18 +147,14 @@
 'Current session': 'Sesiune curentă',
 'currently running': 'acum în funcționare',
 'currently saved or': 'în prezent salvat sau',
-'customize me!': 'Personalizează-mă!',
 'data uploaded': 'date încărcate',
 'Database': 'Baza de date',
-'database': 'bază de date',
 'Database %s select': 'Database %s select',
-'database %s select': 'selectare bază de date %s',
 'Database administration': 'Database administration',
 'database administration': 'administrare bază de date',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Data și ora',
 'db': 'db',
-'DB Model': 'Model bază de date',
 'Debug': 'Debogare',
 'defines tables': 'definire tabele',
 'Delete': 'Șterge',
@@ -195,12 +172,9 @@
 'Deploy to PythonAnywhere': 'Deploy to PythonAnywhere',
 'Deployment form': 'Deployment form',
 'Deployment Interface': 'Deployment Interface',
-'Deployment Recipes': 'Rețete de instalare',
 'Description': 'Descriere',
 'Description:': 'Description:',
 'design': 'design',
-'DESIGN': 'DESIGN',
-'Design for': 'Design pentru',
 'Detailed traceback description': 'Descriere detaliată a mesajului de trasabilitate',
 'details': 'detalii',
 'direction: ltr': 'direcție: stânga-sus-dreapta',
@@ -217,11 +191,8 @@
 'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'documentație',
 'Docs': 'Docs',
-'Documentation': 'Documentație',
-"Don't know what to do?": 'Nu știți ce să faceți?',
 'done!': 'gata!',
 'Downgrade': 'Downgrade',
-'Download': 'Descărcare',
 'Download .w2p': 'Download .w2p',
 'Download as .exe': 'Download as .exe',
 'download layouts': 'descărcare șabloane',
@@ -229,60 +200,44 @@
 'download plugins': 'descărcare plugin-uri',
 'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'E-mail',
-'E-mail invalid': 'E-mail invalid',
-'edit': 'editare',
-'EDIT': 'EDITARE',
 'Edit': 'Editare',
 'edit all': 'edit all',
 'Edit application': 'Editare aplicație',
-'edit controller': 'editare controlor',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Editare înregistrare curentă',
-'Edit Profile': 'Editare profil',
-'edit profile': 'editare profil',
-'Edit This App': 'Editați această aplicație',
 'edit views:': 'editează vederi:',
 'Editing %s': 'Editing %s',
-'Editing file': 'Editare fișier',
-'Editing file "%s"': 'Editare fișier "%s"',
 'Editing Language file': 'Editing Language file',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 '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',
-'enter a number between %(min)g and %(max)g': 'introduceți un număr între %(min)g și %(max)g',
-'enter an integer between %(min)g and %(max)g': 'introduceți un întreg între %(min)g și %(max)g',
 'Error': 'Eroare',
 'Error logs for "%(app)s"': 'Log erori pentru "%(app)s"',
 'Error snapshot': 'Instantaneu eroare',
 'Error ticket': 'Tichet eroare',
-'errors': 'erori',
 'Errors': 'Erori',
 'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
 'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Exception instance attributes',
 'Exit Fullscreen': 'Exit Fullscreen',
-'Expand Abbreviation': 'Extinde abreviația',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
-'Export': 'Export',
 'export as csv file': 'exportă ca fișier csv',
 'Exports:': 'Exports:',
 'exposes': 'expune',
 'exposes:': 'expune:',
 'extends': 'extinde',
 'failed to compile file because:': 'failed to compile file because:',
-'failed to reload module': 'reîncarcare modul nereușită',
 'failed to reload module because:': 'failed to reload module because:',
-'False': 'Neadevărat',
-'FAQ': 'Întrebări frecvente',
 'File': 'Fișier',
 'file "%(filename)s" created': 'fișier "%(filename)s" creat',
 'file "%(filename)s" deleted': 'fișier "%(filename)s" șters',
 'file "%(filename)s" uploaded': 'fișier "%(filename)s" încărcat',
-'file "%(filename)s" was not deleted': 'fișierul "%(filename)s" n-a fost șters',
 'file "%s" of %s restored': 'fișier "%s" de %s restaurat',
 'file changed on disk': 'fișier modificat pe disc',
 'file does not exist': 'fișier inexistent',
@@ -296,33 +251,27 @@
 'Find Next': 'Find Next',
 'Find Previous': 'Find Previous',
 'First name': 'Prenume',
-'Forbidden': 'Interzis',
 'Form has errors': 'Form has errors',
-'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',
 'GAE Password': 'GAE Password',
 'Generate': 'Generate',
-'Get from URL:': 'Obține de la adresa:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
-'Go to Matching Pair': 'Mergi la perechea care se potrivește',
 'go!': 'go!',
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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',
-'Hello World': 'Salutare lume',
-'help': 'ajutor',
 'Help': 'Ajutor',
 'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
@@ -330,87 +279,77 @@
 'Hits': 'Hits',
 'Home': 'Acasă',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'How did you get here?': 'Cum ați ajuns aici?',
-'htmledit': 'editare html',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
-'If 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.\r\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Dacă raportul de deasupra conține un număr de tichet, asta indică un eșec în executarea controlorului, înainte de orice încercare de a executa doctests-urile. Aceasta se întâmplă de obicei din cauza unei erori de identare sau a unei erori din afara corpului funcției.\r\nUn titlu în verde arată ca toate testele (dacă definite) au fost trecute. În acest caz rezultatele testelor nu sunt arătate.',
 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
 'import': 'import',
 'Import/Export': 'Import/Export',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': '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',
-'insert new': 'adaugă nou',
-'insert new %s': 'adaugă nou %s',
 'inspect attributes': 'inspectare atribute',
 '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ă',
 'internal error: %s': 'internal error: %s',
 'Internal State': 'Stare internă',
-'Introduction': 'Introducere',
 'Invalid action': 'Acțiune invalidă',
 'Invalid application name': 'Invalid application name',
 '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',
 'Language files (static strings) updated': 'Fișierele de limbă (șirurile statice de caractere) actualizate',
 'languages': 'limbi',
 'Languages': 'Limbi',
-'languages updated': 'limbi actualizate',
 'Last name': 'Nume',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Ultima salvare:',
-'Layout': 'Șablon',
-'Layout Plugins': 'Șablon plugin-uri',
-'Layouts': 'Șabloane',
 'License for': 'Licență pentru',
 'License:': 'License:',
 'Line Nr': 'Line Nr',
 'Line number': 'Line number',
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
-'Live Chat': 'Chat live',
 'Loading...': 'Loading...',
-'loading...': 'încarc...',
 'Local Apps': 'Local Apps',
 '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',
-'logout': 'ieșire',
 'Logout': 'Ieșire',
-'Lost Password': 'Parolă pierdută',
 'lost password': 'lost password',
-'Lost password?': 'Parolă pierdută?',
 'Main Menu': 'Meniu principal',
 'Manage': 'Manage',
 'Manage %(action)s': 'Manage %(action)s',
@@ -418,20 +357,15 @@
 'Manage Admin Users/Students': 'Manage Admin Users/Students',
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Manage Students',
-'Match Pair': 'Potrivește pereche',
 'Memberships': 'Memberships',
-'Menu Model': 'Model meniu',
 'merge': 'unește',
-'Merge Lines': 'Unește linii',
 'Models': 'Modele',
 'models': 'modele',
 'Modified On': 'Modified On',
 'Modules': 'Module',
 'modules': 'module',
 'Multi User Mode': 'Multi User Mode',
-'My Sites': 'Site-urile mele',
 'Name': 'Nume',
-'New': 'Nou',
 'new application "%s" created': 'aplicația nouă "%s" a fost creată',
 'new application "%s" imported': 'new application "%s" imported',
 'New Application Wizard': 'New Application Wizard',
@@ -444,8 +378,6 @@
 'New simple application': 'O nouă aplicație simplă',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'următoarele 100 de linii',
-'Next Edit Point': 'Următorul punct de editare',
 'NO': 'NU',
 'no changes': 'no changes',
 'No databases in this application': 'Aplicație fără bază de date',
@@ -453,7 +385,6 @@
 'no match': 'no match',
 'no package selected': 'no package selected',
 'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
-'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
 'Node:': 'Node:',
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
@@ -461,32 +392,26 @@
 'Object or table name': 'Obiect sau nume de tabel',
 'Old password': 'Parola veche',
 "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': 'designer online',
-'Online examples': 'Exemple online',
 'Open new app in new window': 'Open new app in new window',
 'OpenShift Deployment Interface': 'OpenShift Deployment Interface',
 'OpenShift Output': 'OpenShift Output',
-'Or': 'Sau',
-'OR': 'SAU',
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'sau importă din fișier csv',
-'or provide application url:': 'sau furnizează adresă url:',
 'Origin': 'Origine',
 'Original/Translation': 'Original/Traducere',
-'Other Plugins': 'Alte plugin-uri',
-'Other Recipes': 'Alte rețete',
 'Overview': 'Prezentare de ansamblu',
 'Overwrite installed app': 'Suprascrie aplicație instalată',
-'pack all': 'împachetează toate',
 'Pack all': 'Împachetează tot',
 'Pack compiled': 'Pack compiled',
-'pack compiled': 'împachetează ce e compilat',
 'Pack custom': 'Pack custom',
 '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.',
@@ -505,15 +430,12 @@
 'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Pus în mișcare de',
-'Preface': 'Prefață',
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': '100 de linii anterioare',
-'Previous Edit Point': 'Punct de editare anterior',
 '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.',
@@ -521,33 +443,34 @@
 'Push': 'Push',
 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.': 'Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.',
 'pygraphviz library not found': 'pygraphviz library not found',
-'Python': 'Python',
 'PythonAnywhere Apps': 'PythonAnywhere Apps',
 'PythonAnywhere Password': 'PythonAnywhere Password',
-'Query': 'Interogare',
 'Query:': 'Interogare:',
-'Quick Examples': 'Exemple rapide',
 'RAM': 'RAM',
 'RAM Cache Keys': 'Chei cache RAM',
 'Ram Cleared': 'Ram Cleared',
 'Rapid Search': 'Rapid Search',
-'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 ID': 'ID înregistrare',
+'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)',
 'Remove compiled': 'Remove compiled',
-'remove compiled': 'șterge compilate',
 'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
 'Replace': 'Replace',
 'Replace All': 'Replace All',
@@ -570,7 +493,6 @@
 'Role': 'Rol',
 'Roles': 'Roles',
 'Rows in Table': 'Rows in Table',
-'Rows in table': 'Linii în tabel',
 'Rows selected': 'Linii selectate',
 'rules are not defined': 'rules are not defined',
 'Run tests': 'Run tests',
@@ -578,19 +500,14 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
 'Save': 'Salvează',
-'save': 'salvare',
 'Save file:': 'Save file:',
 'Save file: %s': 'Save file: %s',
 'Save model as...': 'Save model as...',
-'Save profile': 'Salvează profil',
 'Save via Ajax': 'Salvează utilizând Ajax',
 'Saved file hash:': 'Hash fișier salvat:',
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Căutare',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'selectat',
-'Semantic': 'Semantică',
-'Services': 'Servicii',
 'session': 'sesiune',
 'session expired': 'sesiune expirată',
 'Session saved correctly': 'Session saved correctly',
@@ -598,8 +515,8 @@
 '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',
 'Size of cache:': 'Size of cache:',
 'skip to generate': 'skip to generate',
@@ -611,42 +528,30 @@
 'Start a new app': 'Începe o nouă aplicație',
 'Start searching': 'Start searching',
 'Start wizard': 'Startează magician',
-'starts with': 'începe cu',
 'state': 'stare',
-'Static': 'Static',
 'static': 'static',
+'Static': 'Static',
 'Static files': 'Fișiere statice',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'Stylesheet': 'Foaie de stiluri',
-'submit': 'submit',
 'Submit': 'Înregistrează',
+'submit': 'submit',
 'successful': 'cu succes',
-'Support': 'Suport',
-'Sure you want to delete this object?': 'Sigur ștergeți acest obiect?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'tabel',
 'Table': 'Table',
-'Table name': 'Nume tabel',
 'Temporary': 'Temporary',
 'test': 'test',
 'Testing application': 'Testare aplicație',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Interogarea (query)" este o condiție de tipul "db.tabel1.câmp1==\'valoare\'". Ceva de genul "db.tabel1.câmp1==db.tabel2.câmp2" generează un JOIN SQL.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'logica aplicației, fiecare rută URL este mapată într-o funcție expusă de controlor',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'Logica aplicației, fiecare rută URL este mapată într-o funcție expusă de controlor',
-'The Core': 'Nucleul',
-'the data representation, define database tables and sets': 'reprezentarea datelor, definește tabelele bazei de date și seturile (de date)',
 'The data representation, define database tables and sets': 'Reprezentarea datelor, definește tabele și seturi de date',
-'The output of the file is a dictionary that was rendered by the view': 'Fișierul produce un dicționar care a fost prelucrat de vederea',
 'The presentations layer, views are also known as templates': 'Nivelul de prezentare, vederile sunt cunoscute de asemenea ca șabloane',
-'the presentations layer, views are also known as templates': 'nivelul de prezentare, vederile sunt de asemenea numite și șabloane',
-'The Views': 'Vederile',
 'Theme': 'Theme',
 'There are no controllers': 'Nu există controlori',
 'There are no models': 'Nu există modele',
@@ -659,13 +564,11 @@
 'There are no views': 'Nu există vederi',
 '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': '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 is a copy of the scaffolding application': 'Aceasta este o copie a aplicației schelet',
+'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': 'Aceasta este șablonul fișierului %(filename)s',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
@@ -683,16 +586,12 @@
 'toggle breakpoint': 'comutare breakpoint',
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
-'too short': 'prea scurt',
 'Traceback': 'Trasabilitate',
-'translation strings for the application': 'șiruri de caractere folosite la traducerea aplicației',
 'Translation strings for the application': 'Șiruri de traducere pentru aplicație',
-'True': 'Adevărat',
-'try': 'încearcă',
 'try something like': 'încearcă ceva de genul',
 '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',
@@ -700,18 +599,16 @@
 'unable to delete file "%(filename)s"': 'imposibil de șters fișierul "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': 'Imposibil de descărcat',
-'Unable to download app': 'Imposibil de descărcat aplicația',
 'Unable to download app because:': 'Unable to download app because:',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': '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',
-'uninstall': 'dezinstalează',
 'Uninstall': 'Dezinstalează',
 'Unsupported webserver working mode: %s': 'Unsupported webserver working mode: %s',
 'update': 'actualizează',
@@ -723,34 +620,31 @@
 'Upload': 'Upload',
 'Upload a package:': 'Încarcă un pachet:',
 'Upload and install packed application': 'Încarcă și instalează aplicație împachetată',
-'upload application:': 'incarcă aplicația:',
-'Upload existing application': 'Încarcă aplicația existentă',
 'upload file:': 'încărcă fișier:',
 'upload plugin file:': 'încarcă fișier plugin:',
 '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ă',
 'variables': 'variables',
 'Verify Password': 'Verifică parola',
-'VERSION': 'VERSIUNE',
 'Version': 'Version',
-'Version %s.%s.%s (%s) %s': 'Versiune %s.%s.%s (%s) %s',
 'Versioning': 'Versiuni',
-'versioning': 'versiuni',
-'Videos': 'Video-uri',
-'View': 'Vedere',
-'view': 'vedere',
 'Views': 'Vederi',
 'views': 'vederi',
 'Warning!': 'Warning!',
@@ -763,26 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py este la zi',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'Ultimele tweet-uri web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
-'Welcome': 'Bine ați venit',
-'Welcome %s': 'Bine ați venit %s',
-'Welcome to web2py': 'Bun venit la web2py',
-'Welcome to web2py!': 'Bun venit la web2py!',
-'Which called the function': 'Care a apelat funcția',
+'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': 'Încadrează cu abreviația',
 'WSGI reference name': 'WSGI reference name',
 'YES': 'DA',
 'Yes': 'Yes',
-'You are successfully running web2py': 'Rulați cu succes web2py',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
-'You can modify this application and adapt it to your needs': '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

@@ -11,34 +11,43 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access)': '(требует подключения к интернету)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(наподобие "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\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** %%{файл}',
-'A new version of web2py is available': 'Доступна новая версия web2py',
-'A new version of web2py is available: %s': 'Доступна новая версия web2py: %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 application': 'О приложении',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': 'добавочный код для вашего приложения',
 'Additional code for your application': 'Допольнительный код для вашего приложения',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'админка отключена, потому что отсутствует пароль администратора',
 'admin disabled because not supported on google app engine': 'admin disabled because not supported on google app engine',
-'admin disabled because not supported on google apps engine': 'админка отключена, т.к. не поддерживается на google app engine',
 'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'админка отключена, т.к. невозможно получить доступ к файлу с паролями ',
 'Admin is disabled because insecure channel': 'Админпанель выключена из-за небезопасного соединения',
-'Admin is disabled because unsecure channel': 'Админпанель выключен из-за небезопасного соединения',
 'Admin language': 'Язык админпанели',
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'интерфейс администратора',
 'Administrator Password:': 'Пароль администратора:',
-'and rename it (required):': 'и переименуйте его (необходимо):',
 'and rename it:': ' и переименуйте его:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
@@ -51,14 +60,13 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
-'Are you sure you want to uninstall application "%s"': 'Вы действительно хотите удалить приложение "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Вы действительно хотите удалить приложение "%s"?',
-'Are you sure you want to upgrade web2py now?': 'Вы действительно хотите обновить web2py сейчас?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'аргументы',
 'at char %s': 'at char %s',
@@ -66,17 +74,14 @@
 'ATTENTION:': 'ATTENTION:',
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ВНИМАНИЕ: Для входа требуется бесопасное (HTTPS) соединение либо запуск на localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ВНИМАНИЕ: Тестирование не потокобезопасно, поэтому не запускайте несколько тестов параллельно.',
-'ATTENTION: This is an experimental feature and it needs more testing.': 'ВНИМАНИЕ: Это экспериментальная возможность и требует тестирования.',
 'ATTENTION: you cannot edit the running application!': 'ВНИМАНИЕ: Вы не можете редактировать работающее приложение!',
-'Authentication': 'Аутентификация',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
-'Available databases and tables': 'Доступные базы данных и таблицы',
 'Available Databases and Tables': 'Available Databases and Tables',
 'back': 'назад',
 'Back to the plugins list': 'Back to the plugins list',
 'Back to wizard': 'Back to wizard',
 'Basics': 'Basics',
-'beautify': 'Раскрасить',
 'Begin': 'Begin',
 'breakpoint': 'breakpoint',
 'Breakpoints': 'Breakpoints',
@@ -88,19 +93,16 @@
 'Cache Cleared': 'Cache Cleared',
 'Cache Keys': 'Cache Keys',
 'cache, errors and sessions cleaned': 'Кэш, ошибки и сессии очищены',
-'call': 'вызов',
 'can be a git repo': 'can be a git repo',
 'Cancel': 'Cancel',
 'Cannot be empty': 'Не может быть пустым',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Невозможно компилировать: в приложении присутствуют ошибки. Отладьте его, исправьте ошибки и попробуйте заново.',
 'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
 'cannot create file': 'Невозможно создать файл',
 'cannot upload file "%(filename)s"': 'Невозможно загрузить файл "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Изменить пароль администратора',
 'change editor settings': 'change editor settings',
-'Change Password': 'Изменить пароль',
-'change password': 'изменить пароль',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'проверить все',
 'Check for upgrades': 'проверить обновления',
@@ -111,11 +113,9 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 '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': 'нажмите для проверки обновления',
 'Client IP': 'IP клиента',
 'code': 'код',
 'Code listing': 'Code listing',
@@ -131,15 +131,11 @@
 'compiled application removed': 'скомпилированное приложение удалено',
 'Condition': 'Condition',
 'continue': 'continue',
-'Controller': 'Контроллер',
 'Controllers': 'Контроллеры',
 'controllers': 'контроллеры',
-'Copyright': 'Copyright',
 'Count': 'Count',
 'Create': 'Создать',
 'create file with filename:': 'Создать файл с названием:',
-'create new application:': 'создать новое приложение:',
-'Create new simple application': 'Создать новое простое приложение',
 'Create/Upload': 'Create/Upload',
 'created by': 'создано',
 'Created by:': 'Created by:',
@@ -151,18 +147,14 @@
 'Current session': 'Текущая сессия',
 'currently running': 'сейчас работает',
 'currently saved or': 'сейчас сохранено или',
-'customize me!': 'настрой меня!',
 'data uploaded': 'дата загрузки',
 'Database': 'База данных',
-'database': 'база данных',
 'Database %s select': 'Database %s select',
-'database %s select': 'Выбор базы данных %s ',
 'Database administration': 'Database administration',
 'database administration': 'администрирование базы данных',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Дата и время',
 'db': 'бд',
-'DB Model': 'Модель БД',
 'Debug': 'Debug',
 'defines tables': 'определить таблицы',
 'Delete': 'Удалить',
@@ -183,8 +175,6 @@
 'Description': 'Описание',
 'Description:': 'Description:',
 'design': 'дизайн',
-'DESIGN': 'ДИЗАЙН',
-'Design for': 'Дизайн для',
 'Detailed traceback description': 'Detailed traceback description',
 'details': 'details',
 'direction: ltr': 'направление: ltr',
@@ -201,7 +191,6 @@
 'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'docs',
 'Docs': 'Docs',
-'documentation': 'документация',
 'done!': 'выполнено!',
 'Downgrade': 'Downgrade',
 'Download .w2p': 'Download .w2p',
@@ -211,39 +200,32 @@
 'download plugins': 'загрузить плагины',
 'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'E-mail',
-'EDIT': 'ПРАВКА',
 'Edit': 'Правка',
 'edit all': 'edit all',
 'Edit application': 'Правка приложения',
-'edit controller': 'правка контроллера',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Правка текущей записи',
-'Edit Profile': 'Правка профиля',
-'edit profile': 'правка профиля',
-'Edit This App': 'Правка данного приложения',
 'edit views:': 'правка видов:',
 'Editing %s': 'Editing %s',
-'Editing file': 'Правка файла',
-'Editing file "%s"': 'Правка файла "%s"',
 'Editing Language file': 'Правка языкового файла',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Журнал ошибок для "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'Ошибка',
-'escape': 'escape',
 'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
 'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Атрибуты объекта исключения',
 'Exit Fullscreen': 'Exit Fullscreen',
-'Expand Abbreviation': 'Раскрыть аббревиатуру',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'Экспорт в CSV',
 'Exports:': 'Exports:',
@@ -251,13 +233,11 @@
 'exposes:': 'exposes:',
 'extends': 'расширяет',
 'failed to compile file because:': 'failed to compile file because:',
-'failed to reload module': 'невозможно загрузить модуль',
 'failed to reload module because:': 'failed to reload module because:',
 'File': 'File',
 'file "%(filename)s" created': 'файл "%(filename)s" создан',
 'file "%(filename)s" deleted': 'файл "%(filename)s" удален',
 'file "%(filename)s" uploaded': 'файл "%(filename)s" загружен',
-'file "%(filename)s" was not deleted': 'файл "%(filename)s" не был удален',
 'file "%s" of %s restored': 'файл "%s" из %s восстановлен',
 'file changed on disk': 'файл изменился на диске',
 'file does not exist': 'файл не существует',
@@ -273,24 +253,25 @@
 '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',
 'GAE Password': 'GAE Password',
 'Generate': 'Generate',
-'Get from URL:': 'Get from URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
-'Go to Matching Pair': 'К подходящей паре',
 'go!': 'go!',
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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 группы',
-'Hello World': 'Привет, Мир',
+'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',
@@ -298,27 +279,22 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'htmledit',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Если отчет выше содержит номер ошибки, это указывает на ошибку при работе контроллера, до попытки выполнить doctest. Причиной чаще является неверные отступы или ошибки в коде вне функции. \nЗеленый заголовок указывает на успешное выполнение всех тестов. В этом случае результаты тестов не показываются.',
-'If you answer "yes", be patient, it may take a while to download': 'Если вы ответили "Да", потерпите, загрузка может потребовать времени',
-'If you answer yes, be patient, it may take a while to download': 'Если вы ответили "Да", потерпите, загрузка может потребовать времени',
 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
 'import': 'import',
 'Import/Export': 'Импорт/Экспорт',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'включает',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
-'Index': 'Индекс',
-'index': 'index',
-'insert new': 'вставить новый',
-'insert new %s': 'вставить новый %s',
 'inspect attributes': 'inspect attributes',
 'Install': 'Установить',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Установленные приложения',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'внутренняя ошибка',
@@ -329,27 +305,31 @@
 '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" создан/обновлен',
 'Language files (static strings) updated': 'Языковые файлы (статичные строки) обновлены',
 'languages': 'языки',
 'Languages': 'Языки',
-'languages updated': 'языки обновлены',
 'Last name': 'Фамилия',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Последнее сохранение:',
-'Layout': 'Верстка',
 'License for': 'Лицензия для',
 'License:': 'License:',
 'Line Nr': 'Line Nr',
@@ -357,20 +337,19 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'загрузка...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
-'located in the file': 'расположенный в файле',
-'login': 'логин',
+'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',
 'Logout': 'выход',
-'Lost Password': 'Забыли пароль',
 'lost password': 'lost password',
-'lost password?': 'Пароль утерян?',
 'Main Menu': 'Главное меню',
 'Manage': 'Manage',
 'Manage %(action)s': 'Manage %(action)s',
@@ -378,11 +357,8 @@
 'Manage Admin Users/Students': 'Manage Admin Users/Students',
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Manage Students',
-'Match Pair': 'Найти пару',
 'Memberships': 'Memberships',
-'Menu Model': 'Модель меню',
 'merge': 'объединить',
-'Merge Lines': 'Объединить линии',
 'Models': 'Модели',
 'models': 'модели',
 'Modified On': 'Modified On',
@@ -394,6 +370,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': 'Новая запись',
@@ -401,8 +378,6 @@
 'New simple application': 'Новое простое приложение',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'следующие 100 строк',
-'Next Edit Point': 'Следующее место правки',
 'NO': 'НЕТ',
 'no changes': 'no changes',
 'No databases in this application': 'В приложении нет базы данных',
@@ -414,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',
@@ -421,8 +398,6 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'или испорт из cvs файла',
-'or provide app url:': 'или URL приложения:',
-'or provide application url:': 'или URL приложения:',
 'Origin': 'Оригинал',
 'Original/Translation': 'Оригинал/Перевод',
 'Overview': 'Overview',
@@ -433,6 +408,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,7 +419,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
-'please wait!': 'подождите, пожалуйста!',
+'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': 'Плагин "%s" в приложении',
@@ -454,10 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': 'предыдущие 100 строк',
-'Previous Edit Point': 'Предыдущее место правки',
 'Private files': 'Private files',
 'private files': 'private files',
+'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.',
@@ -473,22 +451,32 @@
 'Ram Cleared': 'Ram Cleared',
 '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 ID': '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': 'Сброс пароля',
@@ -504,17 +492,14 @@
 'Revision:': 'Revision:',
 'Role': 'Роль',
 'Roles': 'Roles',
-'Rows in table': 'Строк в таблице',
 'Rows in Table': 'Rows in Table',
 'Rows selected': 'Выбрано строк',
 'rules are not defined': 'rules are not defined',
-'rules:': 'rules:',
 'Run tests': 'Run tests',
 'Run tests in this file': 'Run tests in this file',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
 'Save': 'Save',
-'save': 'сохранить',
 'Save file:': 'Save file:',
 'Save file: %s': 'Save file: %s',
 'Save model as...': 'Save model as...',
@@ -523,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'выбрано',
 'session': 'session',
 'session expired': 'сессия истекла',
 'Session saved correctly': 'Session saved correctly',
@@ -531,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': 'сайт',
 'Size of cache:': 'Size of cache:',
@@ -544,42 +529,29 @@
 'Start searching': 'Start searching',
 'Start wizard': 'запустить мастер',
 'state': 'статус',
-'Static': 'Static',
 'static': 'статичные файлы',
+'Static': 'Static',
 'Static files': 'Статические файлы',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'Stylesheet': 'Таблицы стилей',
-'submit': 'Отправить',
 'Submit': 'Submit',
+'submit': 'Отправить',
 'successful': 'successful',
-'Sure you want to delete this object?': 'Действительно хотите удалить данный объект?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'таблица',
 'Table': 'Table',
-'Table name': 'Название таблицы',
 'Temporary': 'Temporary',
 'test': 'тест',
-'test_def': 'test_def',
-'test_for': 'test_for',
-'test_if': 'test_if',
-'test_try': 'test_try',
 'Testing application': 'Тест приложения',
-'Testing controller': 'Тест контроллера',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"query" является условием вида "db.table1.field1 == \'значение\'". Что-либо типа "db.table1.field1 db.table2.field2 ==" ведет к SQL JOIN.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'Логика приложения, каждый URL отображается в открытую функцию в контроллере',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'Логика приложения, каждый URL отображается к одной функции в контроллере',
-'the data representation, define database tables and sets': 'представление данных, определить таблицы и наборы',
 'The data representation, define database tables and sets': 'Представление данных, определите таблицы базы данных и наборы',
-'The output of the file is a dictionary that was rendered by the view': 'Выводом файла является словарь, который создан в виде',
 'The presentations layer, views are also known as templates': 'Слой презентации, виды так же известны, как шаблоны',
-'the presentations layer, views are also known as templates': 'слой представления, виды известные так же как шаблоны',
 'Theme': 'Theme',
 'There are no controllers': 'Отсутствуют контроллеры',
 'There are no models': 'Отсутствуют модели',
@@ -592,12 +564,11 @@
 '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 is a copy of the scaffolding application': 'Это копия сгенерированного приложения',
+'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',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
@@ -608,7 +579,6 @@
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': 'Время',
-'TM': 'TM',
 'to  previous version.': 'на предыдущую версию.',
 'To create a plugin, name a file/folder plugin_[name]': 'Для создания плагина назовите файл/папку plugin_[название]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -617,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
-'translation strings for the application': 'строки перевода для приложения',
 'Translation strings for the application': 'Строки перевода для приложения',
-'try': 'try',
 'try something like': 'попробовать что-либо вида',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'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': 'Невозможно проверить обновления',
@@ -630,14 +599,13 @@
 'unable to delete file "%(filename)s"': 'невозможно удалить файл "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': 'Невозможно загрузить',
-'Unable to download app': 'Невозможно загрузить',
 'Unable to download app because:': 'Unable to download app because:',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'невозможно разобрать файл csv',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'невозможно удалить "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': 'снять выбор всего',
@@ -648,30 +616,35 @@
 'Update:': 'Обновить:',
 'Upgrade': 'Upgrade',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'обновить web2py сейчас',
 'upload': 'загрузить',
 'Upload': 'Upload',
-'Upload & install packed application': 'Загрузить и установить приложение в архиве',
 'Upload a package:': 'Загрузить пакет:',
 'Upload and install packed application': 'Upload and install packed application',
-'upload application:': 'загрузить файл:',
-'Upload existing application': 'Загрузить существующее приложение',
 'upload file:': 'загрузить файл:',
 'upload plugin file:': 'загрузить файл плагина:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Используйте (...)&(...) для AND, (...)|(...) для OR, и ~(...) для NOT при создании сложных запросов.',
-'Use an url:': 'Используйте 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': 'версии',
-'View': 'Вид',
-'view': 'вид',
 'Views': 'Виды',
 'views': 'виды',
 'Warning!': 'Warning!',
@@ -684,25 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py обновлен',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'последние твиты по web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
-'Welcome %s': 'Добро пожаловать, %s',
-'Welcome to web2py': 'Добро пожаловать в web2py',
-'Which called the function': 'Который вызвал функцию',
+'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 reference name',
-'xml': 'xml',
 'YES': 'ДА',
 'Yes': 'Yes',
-'You are successfully running web2py': 'Вы успешно запустили web2by',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
-'You can modify this application and adapt it to your needs': 'Вы можете изменить это приложение и подогнать под свои нужды',
+'You have 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

@@ -11,34 +11,43 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access)': '(zahteva internetni dostop)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(nekaj kot "sl-SI" ali samo "sl")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\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',
-'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',
+'@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': 'Preklic',
 'About': 'Vizitka',
 'About application': 'O aplikaciji',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': 'dodatna koda za vašo aplikacijo',
 'Additional code for your application': 'Dodatna koda za vašo aplikacijo',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': 'skrbnik izključen, ker ni skrbniškega gesla',
 'admin disabled because not supported on google app engine': 'admin disabled because not supported on google app engine',
-'admin disabled because not supported on google apps engine': 'skrbnik izključen, ker ni podprt na Google App sistemu',
 'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': 'skrbnik izključen, ker ne morem dostopati do datoteke z gesli',
 'Admin is disabled because insecure channel': 'Skrbnik je izključen zaradi nezavarovane povezave',
-'Admin is disabled because unsecure channel': 'Skrbnik je izključen zaradi nezavarovane povezave',
 'Admin language': 'Skrbniški jezik',
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'skrbniški vmesnik',
 'Administrator Password:': 'Skrbniško geslo:',
-'and rename it (required):': 'in jo preimenujte (obvezno):',
 'and rename it:': ' in jo preimenujte:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
@@ -51,14 +60,13 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
 'Are you sure you want to delete this object?': 'Ali res želite izbrisati ta predmet?',
-'Are you sure you want to uninstall application "%s"': 'Ali res želite odstraniti program "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Ali res želite odstraniti program "%s"?',
-'Are you sure you want to upgrade web2py now?': 'Ali želite sedaj nadgraditi web2py?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'argumenti',
 'at char %s': 'at char %s',
@@ -66,17 +74,14 @@
 'ATTENTION:': 'ATTENTION:',
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'POZOR: Prijava zahteva varno povezavo (HTTPS) ali lokalni (localhost) dostop.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'POZOR: Testiranje ni večopravilno, zato ne poganjajte več testov hkrati.',
-'ATTENTION: This is an experimental feature and it needs more testing.': 'POZOR: To je preizkusni fazi in potrebuje več testiranja.',
 'ATTENTION: you cannot edit the running application!': 'POZOR: Ne morete urejati aplikacije, ki že teče!',
-'Authentication': 'Avtentikacija',
+'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',
 'back': 'nazaj',
 'Back to the plugins list': 'Back to the plugins list',
 'Back to wizard': 'Back to wizard',
 'Basics': 'Basics',
-'beautify': 'olepšaj',
 'Begin': 'Začni',
 'breakpoint': 'breakpoint',
 'Breakpoints': 'Breakpoints',
@@ -88,19 +93,16 @@
 'Cache Cleared': 'Cache Cleared',
 'Cache Keys': 'Cache Keys',
 'cache, errors and sessions cleaned': 'Predpomnilnik, napake in seja so očiščeni',
-'call': 'kliči',
 'can be a git repo': 'can be a git repo',
 'Cancel': 'Cancel',
 'Cannot be empty': 'Ne sme biti prazno',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Nemogoče prevajanje: napake v programu. Odpravite napake in poskusite ponovno.',
 'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
 'cannot create file': 'ne morem ustvariti datoteke',
 'cannot upload file "%(filename)s"': 'ne morem naložiti datoteke "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'Spremenite skrbniško geslo',
 'change editor settings': 'change editor settings',
-'Change Password': 'Spremeni geslo',
-'change password': 'spremeni geslo',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': 'označi vse',
 'Check for upgrades': 'Preveri za posodobitve',
@@ -111,11 +113,9 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
-'click here for online examples': 'kliknite za spletne primere',
-'click here for the administrative interface': 'kliknite za skrbniški vmesnik',
+'Click 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',
 'Client IP': 'IP klienta',
 'code': 'koda',
 'Code listing': 'Code listing',
@@ -131,15 +131,11 @@
 'compiled application removed': 'prevedena aplikacija je odstranjena',
 'Condition': 'Condition',
 'continue': 'continue',
-'Controller': 'Krmilnik',
 'Controllers': 'Krmilniki',
 'controllers': 'krmilniki',
-'Copyright': 'Copyright',
 'Count': 'Število',
 'Create': 'Ustvari',
 'create file with filename:': 'Ustvari datoteko z imenom:',
-'create new application:': 'Ustvari novo aplikacijo:',
-'Create new simple application': 'Ustvari novo enostavno aplikacijo',
 'Create/Upload': 'Create/Upload',
 'created by': 'ustvaril',
 'Created by:': 'Created by:',
@@ -151,18 +147,14 @@
 'Current session': 'Trenutna seja',
 'currently running': 'trenutno teče',
 'currently saved or': 'trenutno shranjeno ali',
-'customize me!': 'Spremeni me!',
 'data uploaded': 'podatki naloženi',
 'Database': 'Podatkovna baza',
-'database': 'podatkovna baza',
 'Database %s select': 'Database %s select',
-'database %s select': 'izberi podatkovno bazo %s ',
 'Database administration': 'Database administration',
 'database administration': 'upravljanje s podatkovno bazo',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': 'Datum in čas',
 'db': 'db',
-'DB Model': 'Podatkovni model',
 'Debug': 'Debug',
 'defines tables': 'definiraj tabele',
 'Delete': 'Izbriši',
@@ -183,8 +175,6 @@
 'Description': 'Opis',
 'Description:': 'Description:',
 'design': 'oblikuj',
-'DESIGN': 'Izgled',
-'Design for': 'Oblikuj za',
 'Detailed traceback description': 'Natačen opis sledenja',
 'details': 'podrobnosti',
 'direction: ltr': 'smer: ltr',
@@ -201,7 +191,6 @@
 'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
 'docs': 'docs',
 'Docs': 'Docs',
-'documentation': 'dokumentacija',
 'done!': 'Narejeno!',
 'Downgrade': 'Downgrade',
 'Download .w2p': 'Download .w2p',
@@ -211,39 +200,32 @@
 'download plugins': 'prenesi vtičnik',
 'Download plugins from repository': 'Download plugins from repository',
 'E-mail': 'E-mail',
-'EDIT': 'UREDI',
 'Edit': 'Uredi',
 'edit all': 'edit all',
 'Edit application': 'Uredi program',
-'edit controller': 'uredi krmilnik',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Uredi trenutni zapis',
-'Edit Profile': 'Uredi profil',
-'edit profile': 'uredi profil',
-'Edit This App': 'Uredi ta program',
 'edit views:': 'urejaj poglede:',
 'Editing %s': 'Editing %s',
-'Editing file': 'Urejanje datoteke',
-'Editing file "%s"': 'Urejanje datoteke "%s"',
 'Editing Language file': 'Uredi jezikovno datoteko',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error': 'Napaka',
 'Error logs for "%(app)s"': 'Dnevnik napak za "%(app)s"',
 'Error snapshot': 'Posnetek napake',
 'Error ticket': 'Listek napake',
 'Errors': 'Napake',
-'escape': 'escape',
 'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
 'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Lastnosti instance izjeme',
 'Exit Fullscreen': 'Exit Fullscreen',
-'Expand Abbreviation': 'Razširi okrajšave',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'izvozi kot CSV',
 'Exports:': 'Exports:',
@@ -251,13 +233,11 @@
 'exposes:': 'exposes:',
 'extends': 'razširja',
 'failed to compile file because:': 'failed to compile file because:',
-'failed to reload module': 'nisem uspel ponovno naložiti modula',
 'failed to reload module because:': 'failed to reload module because:',
 'File': 'Datoteka',
 'file "%(filename)s" created': 'datoteka "%(filename)s" ustvarjena',
 'file "%(filename)s" deleted': 'datoteka "%(filename)s" izbrisana',
 'file "%(filename)s" uploaded': 'datoteka "%(filename)s" prenešena',
-'file "%(filename)s" was not deleted': 'datoteka "%(filename)s" ni bila izbrisana',
 'file "%s" of %s restored': 'datoteka "%s" od %s obnovljena',
 'file changed on disk': 'datoteka je bila spremenjena',
 'file does not exist': 'datoteka ne obstaja',
@@ -273,24 +253,25 @@
 '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',
 'GAE Password': 'GAE Password',
 'Generate': 'Generate',
-'Get from URL:': 'Naloži iz URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
-'Go to Matching Pair': 'Pojdi k ujemalnemu paru',
 'go!': 'go!',
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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',
-'Hello World': 'Pozdravljen, Svet!',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
 'Help': 'Pomoč',
 'here': 'here',
 'Hide/Show Translated strings': 'Hide/Show Translated strings',
@@ -298,27 +279,22 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'htmledit',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'Če poročilo zgoraj vsebuje številko listka to pomeni napako pri izvajanju krmilnika, še preden so se izvedli doctesti. To ponavadi pomeni napako pri zamiku programske vrstice ali izven funkcije.\nZelen naslov označuje, da so vsi testi opravljeni. V tem primeru testi niso prikazani.',
-'If you answer "yes", be patient, it may take a while to download': 'Če odgovorite z "DA", potrpite. Prenos traja nekaj časa',
-'If you answer yes, be patient, it may take a while to download': 'Če odgovorite z "DA", potrpite. Prenos traja nekaj časa',
 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.': 'if your application uses a database other than sqlite you will then have to configure its DAL in pythonanywhere.',
 'import': 'import',
 'Import/Export': 'Uvoz/Izvoz',
 'In development, use the default Rocket webserver that is currently supported by this debugger.': 'In development, use the default Rocket webserver that is currently supported by this debugger.',
 'includes': 'vključuje',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Indent with tabs': 'Indent with tabs',
-'Index': 'Indeks',
-'index': 'indeks',
-'insert new': 'vstavi nov',
-'insert new %s': 'vstavi nov %s',
 'inspect attributes': 'pregled lastnosti',
 'Install': 'Namesti',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Nameščene aplikacije',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'notranja napaka',
@@ -329,27 +305,31 @@
 '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',
 'Language files (static strings) updated': 'Jezikovna datoteka (statično besedilo) posodobljeno',
 'languages': 'jeziki',
 'Languages': 'Jeziki',
-'languages updated': 'jeziki posodobljeni',
 'Last name': 'Priimek',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Zadnjič shranjeno:',
-'Layout': 'Postavitev',
 'License for': 'Licenca za',
 'License:': 'License:',
 'Line Nr': 'Line Nr',
@@ -357,20 +337,19 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': 'nalaganje...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
-'located in the file': 'se nahaja v datoteki',
-'login': 'prijava',
+'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 v skrbniški vmesnik',
 'Login/Register': 'Login/Register',
 'Logout': 'Odjava',
-'Lost Password': 'Izgubljeno geslo',
 'lost password': 'lost password',
-'lost password?': 'Izgubljeno geslo?',
 'Main Menu': 'Glavni meni',
 'Manage': 'Manage',
 'Manage %(action)s': 'Manage %(action)s',
@@ -378,11 +357,8 @@
 'Manage Admin Users/Students': 'Manage Admin Users/Students',
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Manage Students',
-'Match Pair': 'Ujemalni par',
 'Memberships': 'Memberships',
-'Menu Model': 'Model menija',
 'merge': 'združi',
-'Merge Lines': 'Združi vrstice',
 'Models': 'Modeli',
 'models': 'modeli',
 'Modified On': 'Modified On',
@@ -394,6 +370,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',
@@ -401,8 +378,6 @@
 'New simple application': 'Nova enostavna aplikacija',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'naslednjih 100 zapisov',
-'Next Edit Point': 'Naslednja točka urejanja',
 'NO': 'NE',
 'no changes': 'no changes',
 'No databases in this application': 'V tem programu ni podatkovnih baz',
@@ -414,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',
@@ -421,8 +398,6 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'ali uvozi iz CSV datoteke',
-'or provide app url:': 'ali vpišite URL programa:',
-'or provide application url:': 'ali vpišite URL programa:',
 'Origin': 'Izvor',
 'Original/Translation': 'Izvor/Prevod',
 'Overview': 'Overview',
@@ -433,6 +408,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,7 +419,7 @@
 'Permission': 'Permission',
 'Permissions': 'Permissions',
 'Please': 'Please',
-'please wait!': 'Prosim počakajte!',
+'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': 'Vtičnik "%s" v aplikaciji',
@@ -454,10 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': 'prejšnjih 100 zapisov',
-'Previous Edit Point': 'Prejšnja točka urejanja',
 'Private files': 'Private files',
 'private files': 'private files',
+'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.',
@@ -473,22 +451,32 @@
 'Ram Cleared': 'Ram Cleared',
 '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 ID': 'ID zapisa',
+'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',
@@ -504,7 +492,6 @@
 'Revision:': 'Revision:',
 'Role': 'Vloga',
 'Roles': 'Roles',
-'Rows in table': 'Vrstic v tabeli',
 'Rows in Table': 'Rows in Table',
 'Rows selected': 'Izbranih vrstic',
 'rules are not defined': 'rules are not defined',
@@ -513,7 +500,6 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Poženi teste v tej datoteki (za vse teste uporabite gumb 'test')",
 'Running on %s': 'Running on %s',
 'Save': 'Save',
-'save': 'shrani',
 'Save file:': 'Save file:',
 'Save file: %s': 'Save file: %s',
 'Save model as...': 'Save model as...',
@@ -522,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'izbrano',
 'session': 'seja',
 'session expired': 'seja pretekla',
 'Session saved correctly': 'Session saved correctly',
@@ -530,6 +515,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:',
@@ -543,42 +529,29 @@
 'Start searching': 'Start searching',
 'Start wizard': 'Zaženi čarovnika',
 'state': 'stanje',
-'Static': 'Static',
 'static': 'statično',
+'Static': 'Static',
 'Static files': 'Statične datoteke',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'Stylesheet': 'CSS datoteka',
-'submit': 'pošlji',
 'Submit': 'Submit',
+'submit': 'pošlji',
 'successful': 'successful',
-'Sure you want to delete this object?': 'Ali res želite izbrisati ta predmet?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'tabela',
 'Table': 'Table',
-'Table name': 'Ime tabele',
 'Temporary': 'Temporary',
 'test': 'test',
-'test_def': 'test_def',
-'test_for': 'test_for',
-'test_if': 'test_if',
-'test_try': 'test_try',
 'Testing application': 'Testiranje programa',
-'Testing controller': 'Testiranje krmilnika',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"vprašanje" je pogoj kot npr. "db.table1.field1 == \'vrednost\'". Nekaj kot "db.table1.field1 == db.table2.field2" izvede SQL operacijo JOIN.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'krmilna logika, vsaka URL pot je preslikana v eno funkcijo v krmilniku',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika delovanja aplikacije. Vsak URL je povezan z eno objavljeno funkcijo v krmilniku',
-'the data representation, define database tables and sets': 'podatkovna predstavitev, definirajte tabele in množice',
 'The data representation, define database tables and sets': 'Predstavitev podatkov. Definirajte podatkovne tabele in množice',
-'The output of the file is a dictionary that was rendered by the view': 'Rezultat datoteke je slovar, ki ga predela pogled',
 'The presentations layer, views are also known as templates': 'Predstavitveni nivo. Pogledi so znani tudi kot predloge',
-'the presentations layer, views are also known as templates': 'predstavitveni nivo, pogledi so tudi znani kot predloge',
 'Theme': 'Theme',
 'There are no controllers': 'Ni krmilnikov',
 'There are no models': 'Ni modelov',
@@ -591,12 +564,11 @@
 'There are no views': 'Ni pogledov',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'Te datoteke so poslane brez obdelave. Vaše slike shranite tu.',
-'these files are served without processing, your images go here': 'te datoteke so poslane brez posredovanja in obdelave, svoje slike shranite tu',
+'This 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 is a copy of the scaffolding application': 'To je kopija okvirne aplikacije',
+'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 je predloga %(filename)s',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
@@ -607,7 +579,6 @@
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': 'Časovni žig',
-'TM': 'TM',
 'to  previous version.': 'na prejšnjo različico.',
 'To create a plugin, name a file/folder plugin_[name]': 'Če želite ustvariti vtičnik, poimenujte datoteko/mapo plugin_[ime]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -616,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Sledljivost',
-'translation strings for the application': 'prevodna besedila za program',
 'Translation strings for the application': 'Prevajalna besedila za aplikacijo',
-'try': 'poskusi',
 'try something like': 'poskusite na primer',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'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',
@@ -629,14 +599,13 @@
 'unable to delete file "%(filename)s"': 'ne morem izbrisati datoteke "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': 'Ne morem prenesti datoteke',
-'Unable to download app': 'Ne morem prenesti programa',
 'Unable to download app because:': 'Unable to download app because:',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'ne morem obdelati csv datoteke',
+'Unable to 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',
@@ -647,30 +616,35 @@
 'Update:': 'Posodobitev:',
 'Upgrade': 'Upgrade',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'posodobi web2py',
 'upload': 'naloži',
 'Upload': 'Upload',
-'Upload & install packed application': 'Naloži in namesti pakirano aplikacijo',
 'Upload a package:': 'Naloži paket:',
 'Upload and install packed application': 'Naloži in namesti pakirano aplikacijo',
-'upload application:': 'naloži program:',
-'Upload existing application': 'Naloži obstoječo aplikacijo',
 'upload file:': 'naloži datoteko:',
 'upload plugin file:': 'naloži vtičnik:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Uporabie (...)&(...) za AND, (...)|(...) za OR, in ~(...) za NOT pri gradnji kompleksnih povpraševanj.',
-'Use an url:': 'Uporabite URL:',
-'user': 'uporabnik',
 'User': 'User',
+'User %(id)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',
-'View': 'Pogled',
-'view': 'pogled',
 'Views': 'Pogledi',
 'views': 'pogledi',
 'Warning!': 'Warning!',
@@ -683,25 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py je ažuren',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'zadnji tviti na web2py',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
-'Welcome %s': 'Dobrodošli, %s',
-'Welcome to web2py': 'Dobrodošli v web2py',
-'Which called the function': 'Ki je klical funkcijo',
+'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': 'Ovij z okrajšavo',
 'WSGI reference name': 'WSGI reference name',
-'xml': 'xml',
 'YES': 'DA',
 'Yes': 'Yes',
-'You are successfully running web2py': 'Uspešno ste pognali web2py',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
-'You can modify this application and adapt it to your needs': 'Lahko spremenite to aplikacijo in jo prilagodite vašim potrebam',
+'You have 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

@@ -11,12 +11,27 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%d-%m-%Y',
 '%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
-'(requires internet access)': '(захтијева приступ интернету)',
 '(requires internet access, experimental)': '(захтијева приступ интернету, експериментално)',
 '(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 +60,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 +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!': 'ПАЖЊА: не можете уређивати покренуту апликацију!',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available Databases and Tables': 'Доступне базе података и табеле',
 'back': 'назад',
@@ -85,6 +102,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 +113,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': 'сакрити/приказати све',
@@ -116,7 +136,6 @@
 'Count': 'Редни број',
 'Create': 'Креирај',
 'create file with filename:': 'Креирај датотеку под називом:',
-'Create rules': 'Креирај правила',
 'Create/Upload': 'Креирај/Преузми',
 'created by': 'израдио',
 'Created by:': 'Created by:',
@@ -153,6 +172,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,19 +199,21 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'преузми помоћне модуле',
 'Download plugins from repository': 'Преузми помоћне модуле из репозиторијум',
+'E-mail': 'E-mail',
 'Edit': 'Уреди',
 'edit all': 'уреди све',
 'Edit application': 'Уреди апликацију',
-'edit controller': 'уреди контролер',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Edit current record',
 'edit views:': 'уреди приказ:',
 'Editing %s': 'Уређивање %s',
-'Editing file "%s"': 'Уређивање датотеке "%s"',
 'Editing Language file': 'Уређивање језичке датотеке',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
@@ -204,7 +226,6 @@
 'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Exception instance attributes',
 'Exit Fullscreen': 'Exit Fullscreen',
-'Expand Abbreviation': 'Expand Abbreviation',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'извези као csv датотеку',
 'Exports:': 'Извози:',
@@ -229,24 +250,28 @@
 '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',
 'GAE Password': 'GAE Password',
 'Generate': 'Generate',
-'Get from URL:': 'Преузми са странице:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
-'Go to Matching Pair': 'Go to Matching Pair',
 'go!': 'крени!',
 'Google App Engine Deployment Interface': 'Google App Engine Dинсталационо окружење',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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 +288,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 +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 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': 'Лиценца за',
@@ -302,11 +337,14 @@
 'lists by exception': 'прикажи грешке',
 'lists by ticket': 'прикажи тикете',
 'Loading...': 'Преузимам...',
-'loading...': 'преузимам...',
 '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': 'Пријава/Регистрација',
@@ -319,20 +357,20 @@
 'Manage Admin Users/Students': 'Manage Admin Users/Students',
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Manage Students',
-'Match Pair': 'Match Pair',
 'Memberships': 'Memberships',
 'merge': 'споји',
-'Merge Lines': 'Споји линије',
 'Models': 'Модели',
 'models': 'Модели',
 'Modified On': 'Modified On',
 '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': 'Нови запис',
@@ -340,7 +378,6 @@
 'New simple application': 'Нова једноставна апликација',
 'next': 'следећи',
 'next %s rows': 'next %s rows',
-'Next Edit Point': 'Next Edit Point',
 'NO': 'НЕ',
 'no changes': 'нема промјена',
 'No databases in this application': 'Нема базе података у апликацији',
@@ -348,19 +385,20 @@
 'no match': 'нема подударања',
 'no package selected': 'пакет није одабран',
 'no permission to uninstall "%s"': 'немате овлаштење да деинсталирате "%s"',
-'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
 'Node:': 'Node:',
 'Not Authorized': 'Немате овлашћење',
 'Not supported': 'Није подржано',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'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': 'Отвори нову апликацију у новом прозору',
 'OpenShift Deployment Interface': 'OpenShift инсталационо окружење',
 'OpenShift Output': 'OpenShift Output',
 '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 +406,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 +419,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" у апликацији',
@@ -389,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'Previous Edit Point': 'Previous Edit Point',
 'Private files': 'Приватне датотеке',
 'private files': 'приватне датотеке',
+'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 +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': 'Обнови преусмјерења',
+'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',
@@ -435,7 +495,6 @@
 'Rows in Table': 'Записи у табели',
 'Rows selected': 'Rows selected',
 'rules are not defined': 'правила нису дефинисана',
-'rules:': 'правила:',
 'Run tests': 'Покрени тестове',
 'Run tests in this file': 'Покрени тестове у датотеци',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
@@ -456,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': 'Сајт',
 'Size of cache:': 'Size of cache:',
@@ -469,15 +529,15 @@
 'Start searching': 'Покрени претрагу',
 'Start wizard': 'Покрени чаробњака',
 'state': 'state',
-'Static': 'Static',
 'static': 'static',
+'Static': 'Static',
 'Static files': 'Static files',
 'Statistics': 'Statistics',
 'Step': 'Корак',
 'step': 'kорак',
 'stop': 'stop',
-'submit': 'прихвати',
 'Submit': 'Прихвати',
+'submit': 'прихвати',
 'successful': 'успјешан',
 'switch to : db': 'пређи на : db',
 'switch to : filesystem': 'пређи на : filesystem',
@@ -504,7 +564,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 +578,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 +591,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 +605,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,12 +624,26 @@
 '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': 'Креирање верзија',
 'Views': 'Прикази',
 'views': 'прикази',
@@ -578,18 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py је ажуран',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'web2py Recent Tweets',
 'web2py upgrade': 'web2py надоградња',
 'web2py upgraded; please restart it': 'web2py је ажуриран; молим да рестартујете',
+'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',
 '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/sr-lt.py

@@ -11,13 +11,27 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%d-%m-%Y',
 '%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
-'(requires internet access)': '(zahtijeva pristup internetu)',
 '(requires internet access, experimental)': '(zahtijeva pristup internetu, eksperimentalno)',
 '(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 +60,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 +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: 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',
@@ -83,9 +99,10 @@
 'Cannot compile: there are errors in your app:': 'Ne mogu kompajlirati: greška u aplikaciji:',
 'cannot create file': 'ne mogu kreirati datoteku',
 'cannot upload file "%(filename)s"': 'ne mogu otpremiti datoteku "%(filename)s"',
-'Change admin password': 'Promijeni lozinku administratora',
 'Change Admin Password': 'Promijeni lozinku administratora',
+'Change 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 +113,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',
@@ -117,7 +136,6 @@
 'Count': 'Redni broj',
 'Create': 'Kreiraj',
 'create file with filename:': 'Kreiraj datoteku pod nazivom:',
-'Create rules': 'Kreiraj pravila',
 'Create/Upload': 'Kreiraj/Preuzmi',
 'created by': 'izradio',
 'Created by:': 'Created by:',
@@ -132,15 +150,15 @@
 'data uploaded': 'data uploaded',
 'Database': 'Baza podataka',
 'Database %s select': 'Database %s select',
-'database administration': 'administracija baze podataka',
 'Database administration': 'Administracija baze podataka',
+'database administration': 'administracija baze podataka',
 'Database Administration (appadmin)': 'Administracija baze podataka (appadmin)',
 'Date and Time': 'Datum i vrijeme',
 'db': 'db',
 'Debug': 'Otkloni grešku',
 'defines tables': 'definiše tabele',
-'delete': 'Izbriši',
 'Delete': 'Izbriši',
+'delete': 'Izbriši',
 'delete all checked': 'izbriši sve označeno',
 'delete plugin': 'izbriši pomoćni modul',
 'Delete this file (you will be asked to confirm deletion)': 'Izbriši ovu datoteku (bićete upitani za potvrdu brisanja)',
@@ -154,6 +172,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',
@@ -170,8 +189,8 @@
 'Disk Cleared': 'Disk Cleared',
 'Display line numbers': 'Display line numbers',
 'DO NOT use the "Pack compiled" feature.': 'DO NOT use the "Pack compiled" feature.',
-'Docs': 'Docs',
 'docs': 'dokumentacija',
+'Docs': 'Docs',
 'done!': 'done!',
 'Downgrade': 'Downgrade',
 'Download .w2p': 'Preuzmi kao .w2p',
@@ -180,19 +199,21 @@
 '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',
-'edit controller': 'uredi controller',
 'edit controller:': 'edit controller:',
 'Edit current record': 'Edit current record',
 'edit views:': 'uredi prikaz:',
 'Editing %s': 'Uređivanje %s',
-'Editing file "%s"': 'Uređivanje datoteke "%s"',
 'Editing Language file': 'Uređivanje jezičke datoteke',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
@@ -205,7 +226,6 @@
 'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Exception instance attributes',
 'Exit Fullscreen': 'Exit Fullscreen',
-'Expand Abbreviation': 'Expand Abbreviation',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'izvezi kao csv datoteku',
 'Exports:': 'Izvozi:',
@@ -230,24 +250,28 @@
 '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',
 'GAE Password': 'GAE Password',
 'Generate': 'Generate',
-'Get from URL:': 'Preuzmi sa stranice:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
-'Go to Matching Pair': 'Go to Matching Pair',
 'go!': 'kreni!',
 'Google App Engine Deployment Interface': 'Google App Engine instalaciono okruženje',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
 'Graph Model': 'Graph Model',
 'graph model': 'graph model',
+'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 +288,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 +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': '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',
+'Languages': 'Jezici',
+'Last name': 'Last name',
 'Last Revision': 'Last Revision',
 'Last saved on:': 'Posljednja izmjena:',
 'License for': 'Licenca za',
@@ -303,11 +337,14 @@
 'lists by exception': 'prikaži greške',
 'lists by ticket': 'prikaži tikete',
 'Loading...': 'Preuzimam...',
-'loading...': 'preuzimam...',
 'Local Apps': 'Lokalne aplikacije',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
+'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',
@@ -320,20 +357,20 @@
 'Manage Admin Users/Students': 'Manage Admin Users/Students',
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Manage Students',
-'Match Pair': 'Match Pair',
 'Memberships': 'Memberships',
 'merge': 'spoji',
-'Merge Lines': 'Spoji linije',
 'Models': 'Modeli',
 'models': 'modeli',
 'Modified On': 'Modified On',
-'modules': 'moduli',
 '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 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',
@@ -341,7 +378,6 @@
 'New simple application': 'Nova jednostavna aplikacija',
 'next': 'sledeći',
 'next %s rows': 'next %s rows',
-'Next Edit Point': 'Next Edit Point',
 'NO': 'NE',
 'no changes': 'nema promjena',
 'No databases in this application': 'Nema baze podataka u aplikaciji',
@@ -349,19 +385,20 @@
 'no match': 'nema podudaranja',
 'no package selected': 'paket nije odabran',
 'no permission to uninstall "%s"': 'nemate ovlaštenje da deinstalirate "%s"',
-'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
 'Node:': 'Node:',
 'Not Authorized': 'Nemate ovlašćenje',
 'Not supported': 'Nije podržano',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.',
+'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',
 'OpenShift Deployment Interface': 'OpenShift instalaciono okruženje',
 'OpenShift Output': 'OpenShift Output',
 'or alternatively': 'ili alternativno',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'ili uvezi pomoću csv datoteke',
+'Origin': 'Origin',
 'Original/Translation': 'Original/Prevod',
 'Overview': 'Pregled',
 'Overwrite installed app': 'Zamjeni već postojeću aplikaciju',
@@ -369,7 +406,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,22 +419,23 @@
 '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',
 'plugin not specified': 'plugin not specified',
 'Plugin page': 'Stranica pomoćnih modula',
-'Plugins': 'Pomoćni moduli',
 'plugins': 'pomoćni moduli',
+'Plugins': 'Pomoćni moduli',
 'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Omogućio',
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'Previous Edit Point': 'Previous Edit Point',
-'private files': 'privatne datoteke',
 '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 +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': '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',
@@ -436,7 +495,6 @@
 'Rows in Table': 'Zapisi u tabeli',
 'Rows selected': 'Rows selected',
 'rules are not defined': 'pravila nisu definisana',
-'rules:': 'pravila:',
 'Run tests': 'Pokreni testove',
 'Run tests in this file': 'Pokreni testove u datoteci',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
@@ -457,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': '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 +564,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 +578,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 +591,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 +605,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,15 +624,29 @@
 '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',
-'views': 'prikazi',
 'Views': 'Prikazi',
+'views': 'prikazi',
 'Warning!': 'Upozorenje!',
 'WARNING:': 'UPOZORENJE:',
 'WARNING: The following views could not be compiled:': 'WARNING: Sledeći prikazi ne mogu biti kompajlirani:',
@@ -579,18 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py je ažuran',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'web2py Recent Tweets',
 'web2py upgrade': 'web2py nadogradnja',
 'web2py upgraded; please restart it': 'web2py je ažuriran; molim da restartujete',
+'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',
 'YES': 'DA',
 'Yes': 'Da',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have 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

@@ -11,23 +11,32 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%d-%m-%Y',
 '%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
-'(requires internet access)': '(Internet erişimi gerekir)',
 '(requires internet access, experimental)': '(internet erişimi gerekir, deneysel)',
 '(something like "it-it")': '("it-it" şeklinde birşeyler) ',
 '(version %s)': '(version %s)',
-'1: Setting Parameters': '1: Parametrelerin Yapılandırılması',
 '?': '?',
+'@markmin\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}',
-'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",
+'@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': 'Hakkında',
 'About application': 'Uygulama hakkında',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Kesme noktası ekle',
-'additional code for your application': 'uygulamanız için fazladan kod',
 'Additional code for your application': 'Uygulamanız için fazladan kod',
 'Admin design page': 'Yönetici tasarım sayfası',
 'admin disabled because no admin password': 'yönetici parolası olmadığından admin etkinsiz',
@@ -39,27 +48,25 @@
 'Admin versioning page': 'Yönetici sürümleme sayfası',
 'administrative interface': 'yönetsel arayüz',
 'Administrator Password:': 'Yönetici Parolası:',
-'and rename it (required):': 've yeniden adlandır (gerekli):',
 'and rename it:': 'yeniden adlandır:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'güvenzis kanal olduğundan admin etkinsizleştirildi',
 'Application': 'Uygulama',
 'application "%s" uninstalled': '"%s" uygulaması kaldırıldı',
-'application %(appname)s installed with md5sum: %(digest)s': '%(appname)s uygulaması md5sum %(digest)s ile kuruldu',
 'Application cannot be generated in demo mode': 'Application cannot be generated in demo mode',
 'application compiled': 'uygulama derlendi',
 'Application exists already': 'Application exists already',
 'application is compiled and cannot be designed': 'uygulama derlenmiş ve tasarlanamaz',
 'Application name:': 'Uygulama adı:',
 'Application updated via git pull': 'Application updated via git pull',
+'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?',
 'Are you sure you want to delete plugin "%s"?': '"%s" eklentisini kaldırmak istediğinizden emin misiniz?',
 'Are you sure you want to delete this object?': 'Bu nesneyi silmek istediğinizden emin misiniz?',
 'Are you sure you want to uninstall application "%s"?': '«%s» uygulamasını kaldırmak istediğinizden emin misiniz?',
-'Are you sure you want to upgrade web2py now?': "web2py'yi güncellemek istediğinizden emin misiniz?",
 'Are you sure?': 'Are you sure?',
 'arguments': 'argümanlar',
 'at char %s': 'at char %s',
@@ -68,8 +75,8 @@
 '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',
 'back': 'geri',
 'Back to the plugins list': 'Back to the plugins list',
@@ -77,8 +84,8 @@
 'Basics': 'Temeller',
 'Begin': 'Başla',
 'breakpoint': 'kesme noktası',
-'breakpoints': 'kesme noktaları',
 'Breakpoints': 'Kesme Noktaları',
+'breakpoints': 'kesme noktaları',
 'Bulk Register': 'Bulk Register',
 'Bulk Student Registration': 'Bulk Student Registration',
 'Cache': 'Cache',
@@ -89,13 +96,13 @@
 'can be a git repo': 'git deposu olabilir',
 'Cancel': 'Vazgeç',
 'Cannot be empty': 'Boş olamaz',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Derlenemiyor: uygulamanızda hata(lar) var. Hataları düzeltin ve tekrar deneyin.',
 'Cannot compile: there are errors in your app:': 'Derlenemiyor: uygulamanızda hata(lar) var:',
 'cannot create file': 'dosya oluşturulamıyor',
 'cannot upload file "%(filename)s"': '"%(filename)s" dosyalarını yükleyemiyor',
 'Change Admin Password': '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 +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': '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ç',
@@ -128,8 +136,6 @@
 'Count': 'Sayı',
 'Create': 'Oluştur',
 'create file with filename:': 'dosya adı ile dosya oluştur:',
-'create new application:': 'yeni uygulama oluştur:',
-'Create new simple application': 'Yeni basit uygulama oluştur',
 'Create/Upload': 'Oluştur/Yükle',
 'created by': 'yazan:',
 'Created by:': 'Created by:',
@@ -143,9 +149,7 @@
 'currently saved or': 'şimdiki kaydedilen veya',
 'data uploaded': 'veri yüklendi',
 'Database': 'Database',
-'database': 'veritabı',
 'Database %s select': 'Database %s select',
-'database %s select': '%s veritabanı seçildi',
 'Database administration': 'Veritabanı yönetimi',
 'database administration': 'veritabı yönetimi',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
@@ -168,6 +172,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,28 +199,24 @@
 'Download layouts from repository': 'Download layouts from repository',
 'download plugins': 'eklentileri indir',
 'Download plugins from repository': 'Download plugins from repository',
-'EDIT': 'DÜZENLE',
+'E-mail': 'E-mail',
 'Edit': 'Düzenle',
 'edit all': 'tümünü düzenle',
 'Edit application': 'Uygulamayı düzenle',
-'edit controller': 'denetçiyi düzenle',
 'edit controller:': 'denetçiyi düzenle:',
 'Edit current record': 'Şimdiki kaydı düzenle',
 'edit views:': 'görünümleri düzenle:',
 'Editing %s': '%s Düzenleniyor',
-'Editing file': 'Dosya düzenleniyor',
-'Editing file "%s"': '"%s" dosyası düzenleniyor ',
 'Editing Language file': 'Dil dosyası düzenleniyor',
 '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',
-'enter a valid email address': 'geçerli e-posta adresi girin',
-'enter a value': 'bir değer girin',
-'enter only letters, numbers, and underscore': 'sadece harf, sayı ve alt çizgi giriniz',
-'Enterprise Web Framework': 'Enterprise Web Çatısı',
 'Error': 'Hata',
 'Error logs for "%(app)s"': '"%(app)s" uygulaması için hata kayıtları',
 'Error snapshot': 'Hata resmi',
@@ -225,7 +226,6 @@
 'Exception %s': 'Exception %s',
 'Exception instance attributes': 'Hata durumu özellikleri',
 'Exit Fullscreen': 'Tam Ekrandan Çık',
-'Expand Abbreviation': 'Kısıtlamayı Aç',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'CSV olarak dışa ver',
 'Exports:': 'Exports:',
@@ -233,7 +233,6 @@
 'exposes:': 'sergile:',
 'extends': 'genişlet',
 'failed to compile file because:': 'failed to compile file because:',
-'failed to reload module': 'modül yüklenemedi',
 'failed to reload module because:': 'modü yüklenemedi çünkü:',
 'File': 'Dosya',
 'file "%(filename)s" created': '"%(filename)s" dosyaları oluşturuldu',
@@ -251,8 +250,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',
@@ -265,8 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Motoru Yayınlama Arayüzü',
 'Google Application Id': 'Google Uygulama Id',
 'Goto': 'Git',
-'graph model': 'grafik modeli',
 'Graph Model': 'Graph Model',
+'graph model': 'grafik modeli',
+'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',
@@ -274,7 +279,6 @@
 'Hits': 'Vuruşlar',
 'Home': 'Anasayfa',
 'honored only if the expression evaluates to true': 'sadece deyim doğru sonucunu verirse',
-'htmledit': 'html dğzenleyici',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -284,14 +288,13 @@
 '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',
-'insert new %s': '%s yeni ekle',
 'inspect attributes': 'özellikleri denetleyin',
 'Install': 'Kurucu',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': 'Kurulu uygulamalar',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': 'dahili hata',
@@ -300,24 +303,31 @@
 'Invalid action': 'Geçersiz eylem',
 'Invalid application name': 'Invalid application name',
 'invalid circular reference': 'invalid circular reference',
-'invalid expression': 'geçersiz ifade',
+'Invalid email': 'Invalid email',
 '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ış',
@@ -327,12 +337,14 @@
 'lists by exception': 'istisnaya göre sırala',
 'lists by ticket': 'bilete göre sırala',
 'Loading...': 'Loading...',
-'loading...': 'yükleniyor ...',
 'Local Apps': 'Local Apps',
 'locals': 'yereller',
 'Locals##debug': 'Yereller',
+'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 +365,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',
@@ -364,7 +378,6 @@
 'New simple application': 'Yeni basit uygulama',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'sonraki 100 satır',
 'NO': 'HAYIR',
 'no changes': 'no changes',
 'No databases in this application': 'Bu uygulamada veritabanı yok',
@@ -372,21 +385,20 @@
 'no match': 'eşlenen yok',
 'no package selected': 'hiç paket seçilmemiş',
 'no permission to uninstall "%s"': 'no permission to uninstall "%s"',
-'No ticket_storage.txt found under /private folder': '/private dizininde ticket_storage.txt dosyası bulunamadı',
 'Node:': 'Node:',
 'Not Authorized': 'Not Authorized',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Not: Eğer github hata kodu 128 durumunu bildiren bir ileti alırsanız, OpenShift hesabınızı ait ssh anahtarının doğru yapılandırıldığından emin olun.',
+'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ç',
 'OpenShift Deployment Interface': 'OpenShift Yayınlama Arayüzü',
 'OpenShift Output': 'OpenShift Output',
 'or alternatively': 'veya seçenek olarak',
 'Or Get from URL:': 'Veya şu URL den alın:',
 'or import from csv file': 'veya CSV dsoyasından içerin',
-'or provide app url:': "veya uygulama URL'si verin:",
-'or provide application url:': "veya uygulama URL'si verin:",
+'Origin': 'Origin',
 'Original/Translation': 'Orjinal / Çeviri',
 'Overview': 'Overview',
 'Overwrite installed app': 'Kurulu uygulama üzerine yaz',
@@ -394,8 +406,12 @@
 'Pack compiled': 'Derlenenleri paketle',
 'Pack custom': 'Tercihli paketle',
 'pack plugin': 'eklentiyi paketle',
-'PAM authenticated user, cannot change password here': 'PAM onaylı kullanıcı, parola buradan değiştirilemiyor',
+'Password': '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 +419,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',
@@ -416,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': 'önceki 100 satır',
 'Private files': 'Özel dosyalar',
 'private files': 'özel dosyalar',
+'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.',
@@ -434,21 +451,35 @@
 'Ram Cleared': 'Ram Cleared',
 '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',
@@ -462,7 +493,6 @@
 'Role': 'Role',
 'Roles': 'Roles',
 'Rows in Table': 'Rows in Table',
-'Rows in table': 'Tablosundaki satırlar',
 'Rows selected': 'Seçilen satırlar',
 'rules are not defined': 'rules are not defined',
 'Run tests': 'Run tests',
@@ -470,7 +500,6 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Bu dosyadaki testleri çalıştırır (tüm dosyaları çalıştırmak için, 'test' etiketli düğmeyi kullanabilirsiniz)",
 'Running on %s': '%s üzerinde çalışıyor',
 'Save': 'Kaydet',
-'save': 'kaydet',
 'Save file:': 'Dosyayı kaydet:',
 'Save file: %s': 'Dosyayı farklı kaydet: %s',
 'Save model as...': 'Save model as...',
@@ -479,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Paketlenecek Dosyaları Seç',
-'selected': 'seçildi',
 'session': 'oturum',
 'session expired': 'oturum zamanaşımına uğradı',
 'Session saved correctly': 'Session saved correctly',
@@ -487,6 +515,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:',
@@ -500,21 +529,19 @@
 'Start searching': 'Aramaya başla',
 'Start wizard': 'Başlatma sihirbazı',
 'state': 'durum',
-'Static': 'Statik',
 'static': 'statik',
+'Static': 'Statik',
 'Static files': 'Statik dosyalar',
 'Statistics': 'Statistics',
 'Step': 'Basamak',
 'step': 'step',
 'stop': 'stop',
-'submit': 'gönder',
 'Submit': 'Gönder',
+'submit': 'gönder',
 'successful': 'başarılı',
-'Sure you want to delete this object?': 'Bu nesneyi silmek istediğinizden emin misiniz? ',
 'switch to : db': 'geç : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'tablo',
 'Table': 'Table',
 'Temporary': 'Geçici',
 'test': 'test',
@@ -522,12 +549,9 @@
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"sorgulama" "db.table1.field1==\'değer\'"  şeklinde bir durumu ifade eder. SQL birleştirmede (JOIN) "db.table1.field1==db.table2.field2" şeklindedir.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'uygulama mantığı: her URL denetleyicideki bir işleve eşlenir',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'Uygulama mantığı: her URL denetleyicideki bir işleve eşlenir',
-'the data representation, define database tables and sets': 'veri gösterimi, veritabanı tablolarını ve setlerini tanımla',
 'The data representation, define database tables and sets': 'Veri gösterimi, veritabanı tablolarını ve setlerini tanımla',
 'The presentations layer, views are also known as templates': 'Sunum katmanı, görünümler şablon olarakda biliniyor.',
-'the presentations layer, views are also known as templates': 'sunum katmanı, görünümler şablon olarakda biliniyor.',
 'Theme': 'Theme',
 'There are no controllers': 'Denetçiler yok',
 'There are no models': 'Modeller yok',
@@ -540,11 +564,11 @@
 'There are no views': 'Görünümler yok',
 'These files are not served, they are only available from within your app': 'Bu dosyalar servis yapılmıyor, bunlar sadece uygulamanız içerisinden erişilebilir.',
 'These files are served without processing, your images go here': 'Bu dosyalarda işlem yapılmadan kaydedildi, resimler buraya gidiyor:',
-'these files are served without processing, your images go here': 'bu dosyalarda işlem yapılmadan kaydedildi, resimler buraya gidiyor:',
+'This 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: ',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "Bu sayfa uygulamanızı OpenShif uygulama reposuna koyar. Uygulamanızın web2py iskeleti ile oluşturulduğunuz ve web2py dosya sisteminizdeki ropoya erişilebileceği varsayılmıştır. Bu işlev web2py'nin çalıştığı ortamda GitPython'e ihtiyaç duyar.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'Bu sayfa uygulamanızı Google App Motoru bilişim bulutuna yükleyecektir. İndeksleri yerel olarak oluştırmanız gerektiğini aklınızda tutun, Google uygulama sunucusunu yerel olarak kurup çalıştırın, aksi halde bazı kayıtlarda hatalar olacaktır. Uyarı: yayınlama ağ hızınıza bağlı olarak uzun zaman alabilir. Uyarı: bu sizin app.yaml dosyasını yeniden yazar. LÜTFEN BİRDEN FAZLA GÖNDERMEYİN.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'bu sayfayı, kesme noktasına geldiğini görmek için ve hata ayıklama etkileşmesi gerekiyor..',
@@ -554,7 +578,7 @@
 'Ticket ID': "Bile ID'si",
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
-'TM': 'TM',
+'Timestamp': 'Timestamp',
 'to  previous version.': 'önceki sürüme.',
 'To create a plugin, name a file/folder plugin_[name]': 'Eklenti oluşturmak için dosyayı dosya/klasör plugin_[isim] şeklinde isimlendir. ',
 'To emulate a breakpoint programatically, write:': 'Program ile kesme noktasını öykünmek için, yazın:',
@@ -563,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Tam Ekrana Geç',
 'Traceback': 'Nedenin bul',
-'translation strings for the application': 'uygulama için çeviri cümleleri',
 'Translation strings for the application': 'Uygulama için çeviri cümleleri',
-'try': 'dene',
 'try something like': 'gibi birşey dene',
 'Try the mobile interface': 'Mobil arayüzü dene',
 'try view': 'görünümü dene',
+'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',
@@ -576,15 +599,13 @@
 'unable to delete file "%(filename)s"': '"%(filename)s" dosylaları silinemiyor',
 'unable to delete file plugin "%(plugin)s"': '"%(plugin)s" eklenti dosyasyaları silenemiyor',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': 'İndirilemiyor',
-'Unable to download app': 'Uygulamanız indirilemiyor',
 'Unable to download app because:': 'Uygulamanız indirilemiyor çünkü:',
-'Unable to download because': 'İndirilemiyor çünkü:',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': "impossible d'analyser les fichiers CSV",
+'Unable to 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',
@@ -594,30 +615,36 @@
 'update all languages': 'tüm delleri yükle',
 'Update:': 'Güncelle:',
 'Upgrade': 'Upgrade',
-'upgrade now': 'şimdi güncelle',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': "web2py'yi güncelle",
 'upload': 'yükle',
 'Upload': 'Yükle',
-'Upload & install packed application': 'Paketlenmiş uygulamayı yükle ve kur',
 'Upload a package:': 'Paket yükle:',
 'Upload and install packed application': 'Paketlenmiş uygulamayı yükle ve kur',
-'upload application:': 'uygulamayı yükle:',
-'Upload existing application': 'Var olan uygulamayı yükle',
 'upload file:': 'dosyayı yükle:',
 'upload plugin file:': 'eklenti dosyasını yükle:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Karmaşık sorgularda Ve (AND) için (...)&(...) kullanın, Veya (OR) için (...)|(...) kullanın ve DEĞİL (NOT) için ~(...) kullanın. ',
-'Use an url:': "Url'yi kullan:",
-'user': 'kullanıcı',
 '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',
-'view': 'görüntü',
 'Views': 'Görüntüler',
 'views': 'görüntüler',
 'Warning!': 'Warning!',
@@ -630,17 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py güncel',
 'web2py online debugger': 'çevirimiçi web2py hata ayıklayıcı',
-'web2py Recent Tweets': 'web2py Son Twitler',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py güncellendi, lütfen yeniden başlatın',
+'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

@@ -4,27 +4,36 @@
 '!langname!': 'Українська',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"Оновити" це додатковий вираз, такий, як "field1=\'нове_значення\'". Ви не можете змінювати або вилучати дані об\'єднаних таблиць',
 '"User Exception" debug mode. ': 'Режим ладнання "Сигнали від користувачів" ("User Exception" debug mode) ',
-'"User Exception" debug mode. An error ticket could be issued!': 'Режим ладнання "Сигнали від користувачів" ("User Exception" debug mode). Користувачі можуть залишати позначки про помилки!',
 '%s': '%s',
 '%s %%{row} deleted': 'Вилучено %s %%{рядок}',
 '%s %%{row} updated': 'Вилучено %s %%{рядок}',
-'%s Recent Tweets': '%s %%{останній} %%{твіт}',
 '%s selected': '%s selected',
 '%s students registered': '%s студентів зареєстровано',
 '%Y-%m-%d': '%Y/%m/%d',
 '%Y-%m-%d %H:%M:%S': '%Y/%m/%d %H:%M:%S',
-'(requires internet access)': '(потрібно мати доступ в інтернет)',
 '(requires internet access, experimental)': '(потрібно мати доступ в інтернет, експериментально)',
 '(something like "it-it")': '(щось схоже на "uk-ua")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\x01(**%.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': 'про',
 'About application': 'Про додаток',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Додати точку зупинки',
@@ -41,18 +50,17 @@
 'Administrator Password:': 'Пароль адміністратора:',
 'and rename it:': 'i змінити назву на:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
-'App does not exist or your are not authorized': 'Додаток не існує, або ви не авторизовані',
 'appadmin': 'Aдм.панель',
 'appadmin is disabled because insecure channel': "адмін.панель відключено через використання ненадійного каналу зв'язку",
 'Application': 'Додаток (Application)',
 'application "%s" uninstalled': 'додаток "%s" вилучено',
-'application %(appname)s installed with md5sum: %(digest)s': 'додаток %(appname)s встановлено з md5sum: %(digest)s',
 'Application cannot be generated in demo mode': 'В демо-режимі генерувати додатки не можна',
 'application compiled': 'додаток скомпільовано',
 'Application exists already': 'Додаток вже існує',
 'application is compiled and cannot be designed': 'додаток скомпільований. налаштування змінювати не можна',
 'Application name:': 'Назва додатку:',
 '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,13 +75,12 @@
 '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',
 'back': '<< назад',
 'Back to the plugins list': 'Back to the plugins list',
 'Back to wizard': 'Back to wizard',
-'bad_resource': 'поганий_ресурс',
 'Basics': 'Початок',
 'Begin': 'Початок',
 'breakpoint': 'точку зупинки',
@@ -95,6 +102,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 +113,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': 'згорнути/розгорнути все',
@@ -120,16 +130,12 @@
 'Compile (skip failed views)': 'Compile (skip failed views)',
 'compiled application removed': 'скомпільований додаток вилучено',
 'Condition': 'Умова',
-'contact_admin': "зв'язатись_з_адміністратором",
 'continue': 'продовжити',
 'Controllers': 'Контролери',
 'controllers': 'контролери',
 'Count': 'К-сть',
 'Create': 'Створити',
-'create': 'створити',
 'create file with filename:': 'створити файл з назвою:',
-'create plural-form': 'створити форму множини',
-'Create rules': 'Створити правила',
 'Create/Upload': 'Створити/Завантажити',
 'created by': 'Автор:',
 'Created by:': 'Created by:',
@@ -143,9 +149,7 @@
 'currently saved or': 'останній збережений, або',
 'data uploaded': 'дані завантажено',
 'Database': 'Database',
-'database': 'база даних',
 'Database %s select': 'Database %s select',
-'database %s select': 'Вибірка з бази даних %s',
 'Database administration': 'Database administration',
 'database administration': 'адміністрування бази даних',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
@@ -168,6 +172,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,34 +199,33 @@
 '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': 'Налаштування додатку',
-'edit controller': 'редагувати контролер',
 'edit controller:': 'редагувати контролер:',
 'Edit current record': 'Редагувати поточний запис',
 'edit views:': 'редагувати відображення (views):',
 'Editing %s': 'Редагується %s',
-'Editing file "%s"': 'Редагується файл "%s"',
 'Editing Language 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',
-'enter a value': 'введіть значення',
 'Error': 'Помилка',
 'Error logs for "%(app)s"': 'Список зареєстрованих помилок додатку "%(app)s"',
 'Error snapshot': 'Розгорнутий знімок стану (Error snapshot)',
 'Error ticket': 'Позначка (ticket) про помилку',
 'Errors': 'Помилки',
-'Errors in form, please check it out.': 'Помилка у формі, будь-ласка перевірте її.',
 'Exception %(extype)s: %(exvalue)s': 'Виключення %(extype)s: %(exvalue)s',
 'Exception %s': 'Виключення %s',
 'Exception instance attributes': 'Атрибути примірника класу Exception (виключення)',
 'Exit Fullscreen': 'Вийти з повноекранного режиму',
-'Expand Abbreviation': 'Розгорнути абревіатуру',
 'Expand Abbreviation (html files only)': 'Expand Abbreviation (html files only)',
 'export as csv file': 'експортувати як файл csv',
 'Exports:': 'Exports:',
@@ -230,7 +234,6 @@
 'extends': 'розширює',
 'failed to compile file because:': 'не вдалось скомпілювати файл через:',
 'failed to reload module because:': 'не вдалось перевантажити модуль через:',
-'faq': 'ЧаПи (faq)',
 'File': 'Файл',
 'file "%(filename)s" created': 'файл "%(filename)s" створено',
 'file "%(filename)s" deleted': 'файл "%(filename)s" вилучено',
@@ -247,24 +250,28 @@
 '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',
 'GAE Password': 'Пароль GAE',
 'Generate': 'Генерувати',
-'Get from URL:': 'Отримати з URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Глобальні змінні',
-'Go to Matching Pair': 'Перейти до відповідної пари',
 'go!': 'почали!',
 'Google App Engine Deployment Interface': 'Інтерфейс розгортання Google App Engine',
 'Google Application Id': 'Ідентифікатор Google Application',
 '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': 'Сховати/показати ВЖЕ ПЕРЕКЛАДЕНІ рядки',
@@ -281,14 +288,13 @@
 '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': 'вставити новий',
-'insert new %s': 'вставити новий %s',
 'inspect attributes': 'інспектувати атрибути',
 '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': 'внутрішня помилка',
@@ -296,42 +302,49 @@
 'Internal State': 'Внутрішній стан',
 'Invalid action': 'Помилкова дія',
 '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': 'Ліцензія додатку',
 'License:': 'License:',
 'Line Nr': 'Line Nr',
 'Line number': '№ рядка',
-'LineNo': '№ рядка',
 'lists by exception': 'список виключень (exceptions)',
 'lists by ticket': 'список позначок (tickets)',
 'Loading...': 'Loading...',
-'loading...': 'завантаження...',
 'Local Apps': 'Local Apps',
 'locals': 'локальні',
 'Locals##debug': 'Локальні змінні',
+'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',
@@ -344,25 +357,20 @@
 'Manage Admin Users/Students': 'Адміністратор керування користувачами/студентами',
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Керувати студентами',
-'Match Pair': 'Знайти пару',
 'Memberships': 'Memberships',
 'merge': "з'єднати",
-'Merge Lines': "З'єднати рядки",
-'Minimum length is %s': 'Мінімальна довжина становить %s',
 'Models': 'Моделі',
 'models': 'моделі',
 'Modified On': 'Змінено в',
 'Modules': 'Модулі',
 'modules': 'модулі',
 'Multi User Mode': 'Multi User Mode',
-'Must include at least %s %s': 'Має вміщувати щонайменше %s %s',
-'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': 'Новий запис',
@@ -370,8 +378,6 @@
 'New simple application': 'Новий простий додаток',
 'next': 'наступний',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'наступні 100 рядків',
-'Next Edit Point': 'Наступне місце редагування',
 'NO': 'НІ',
 'no changes': 'no changes',
 'No databases in this application': 'Даний додаток не використовує бази даних',
@@ -379,19 +385,20 @@
 'no match': 'співпадань нема',
 'no package selected': 'пакет не вибрано',
 'no permission to uninstall "%s"': 'нема прав на вилучення (uninstall) "%s"',
-'No ticket_storage.txt found under /private folder': 'В каталозі /private відсутній файл ticket_storage.txt',
 'Node:': 'Node:',
 'Not Authorized': 'Не дозволено',
 'Not supported': 'Not supported',
 'Note: If you receive an error with github status code of 128, ensure the system and account you are deploying from has a cooresponding ssh key configured in the openshift account.': 'Примітка: Якщо ви отримали повідомлення про помилку з кодом стану github рівним 128, переконайтесь, що система та обліковий запис, з якого відбувається розгортання використовують відповідний ключ ssh, налаштований в обліковому записі openshift.',
+'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',
 'OpenShift Deployment Interface': 'OpenShift: Інтерфейс розгортання',
 'OpenShift Output': 'Вивід OpenShift',
 'or alternatively': 'або альтернативно',
 'Or Get from URL:': 'Або Отримати з мережі (ч/з URL):',
 'or import from csv file': 'або імпортувати через csv-файл',
+'Origin': 'Origin',
 'Original/Translation': 'Оригінал/переклад',
 'Overview': 'Overview',
 'Overwrite installed app': 'Перезаписати встановлений додаток',
@@ -399,18 +406,21 @@
 'Pack compiled': 'Пакувати зкомпільоване',
 '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.',
-'peek': 'глянути',
 'Peeking at file': 'Перегляд файлу',
 '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" вилучено',
 'Plugin "%s" in application': 'Втулка "%s" в додатку',
 'plugin not specified': 'втулку не визначено',
@@ -423,10 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': 'попередні 100 рядків',
-'Previous Edit Point': 'Попереднє місце редагування',
 'Private files': 'Приватні файли',
 'private files': 'приватні файли',
+'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.',
@@ -442,23 +451,35 @@
 'Ram Cleared': "Кеш в пам'яті очищено",
 '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',
-'reload': 'перевантажити',
+'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': 'Вилучено точку зупинки у %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, але він не встановлений',
-'resolve': "розв'язати",
+'Reset Password key': 'Reset Password key',
 'Resolve Conflict file': "Файл розв'язування конфлікту",
 'response': 'відповідь',
 'restart': 'перезапустити майстра',
@@ -472,16 +493,12 @@
 'Role': 'Role',
 'Roles': 'Roles',
 'Rows in Table': 'Rows in Table',
-'Rows in table': 'Рядків у таблиці',
 'Rows selected': 'Рядків вибрано',
 'rules are not defined': 'правила не визначені',
-'rules parsed with errors': 'в правилах є помилка',
-'rules:': 'правила:',
 'Run tests': 'Запустити всі тести',
 'Run tests in this file': 'Запустити тести у цьому файлі',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Запустити тести з цього файлу (для тестування всіх файлів, вам необхідно натиснути кнопку з назвою 'тестувати всі')",
 'Running on %s': 'Запущено на %s',
-'runonce': 'одноразово',
 'Save': 'Зберегти',
 'Save file:': 'Зберегти файл:',
 'Save file: %s': 'Зберегти файл: %s',
@@ -489,10 +506,8 @@
 'Save via Ajax': 'зберегти через Ajax',
 'Saved file hash:': 'Хеш збереженого файлу:',
 'Screenshot %s': 'Screenshot %s',
-'search': 'пошук',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': 'відмічено',
 'session': 'сесія',
 'session expired': 'час даної сесії вичерпано',
 'Session saved correctly': 'Session saved correctly',
@@ -500,10 +515,8 @@
 'Set Breakpoint on %s at line %s: %s': 'Додано точку зупинки в %s на рядок %s: %s',
 'shell': 'консоль',
 'Showing %s to %s of %s %s found': 'Showing %s to %s of %s %s found',
-'signup': 'підписатись',
-'signup_requested': 'необхідна_реєстрація',
+'Sign Up': 'Sign Up',
 'Singular Form': 'Форма однини',
-'site': 'сайт',
 'Site': 'Сайт',
 'Size of cache:': 'Size of cache:',
 'skip to generate': 'перейти до генерування результату',
@@ -516,22 +529,20 @@
 'Start searching': 'Розпочати пошук',
 'Start wizard': 'Активувати майстра',
 'state': 'стан',
-'Static': 'Статичні',
 'static': 'статичні',
+'Static': 'Статичні',
 'Static files': 'Статичні файли',
 'Statistics': 'Statistics',
 'Step': 'Крок',
 'step': 'крок',
 'stop': 'зупинити',
-'submit': 'застосувати',
 'Submit': 'Застосувати',
+'submit': 'застосувати',
 'successful': 'успішно',
 'switch to : db': 'перемкнути на : БД',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': 'таблиця',
 'Table': 'Table',
-'tags': 'мітки (tags)',
 'Temporary': 'Тимчасово',
 'test': 'тестувати всі',
 'Testing application': 'Тестування додатку',
@@ -553,21 +564,21 @@
 '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',
 "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.": 'На цій сторінці можна закомітити ваші зміни в репозитарій додатків openshift та проштовхнути їх у ваш примірник в хмарі. Це передбачає, що ви вже створили примірник додатку, використовуючи базовий додаток web2py, як скелет, і маєте репозитарій десь на вашій файловій системі, причому екземпляр web2py має до нього доступ. Ця властивість вимагає наявності встановленого модулю GitPython так, щоб web2py міг його викликати.',
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'На цій сторінці ви можете завантажити свій додаток в сервіс хмарних обчислень Google App Engine. Майте на увазі, що спочатку необхідно локально створити індекси, і це можна зробити встановивши сервер додатків Google appserver та запустивши в ньому додаток один раз, інакше при виборі записів виникатимуть помилки. Увага: розгортання може зайняти тривалий час, в залежності від швидкості мережі. Увага: це призведе до перезапису app.yaml. НЕ ПУБЛІКУЙТЕ ДВІЧІ.',
 '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"?': '"Втягнути" (pull) зміни з віддаленого репозитарію для додатку "%s"?',
 'This will push changes to the remote repo for application "%s".': 'Проштовхнути (push) зміни у віддалений репозитарій для додатку "%s"?',
-'ticket': 'позначка',
 'Ticket': 'Позначка (Ticket)',
 'Ticket ID': 'Ід.позначки (Ticket ID)',
 '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,37 +591,31 @@
 '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.',
 'Unable to check for upgrades': 'Неможливо перевірити оновлення',
 'unable to create application "%s"': 'не можу створити додаток "%s"',
-'unable to create application "%s" (it may exist already)': 'не можу створити додаток "%s" (можливо його вже створено)',
 'unable to delete file "%(filename)s"': 'не можу вилучити файл "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'не можу вилучити файл втулки "%(plugin)s"',
 'Unable to determine the line number!': 'Не можу визначити номер рядка!',
 'Unable to download app because:': 'Не можу завантажити додаток через:',
-'Unable to download because:': 'Неможливо завантажити через:',
 'unable to download layout': 'не вдається завантажити макет',
 'unable to download plugin: %s': 'не вдається завантажити втулку: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
-'unable to install application "%(appname)s"': 'не вдається встановити додаток "%(appname)s"',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': 'не вдається розібрати csv-файл',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': 'не вдається вилучити "%s"',
 'unable to upgrade because "%s"': 'не вдається оновити, тому що "%s"',
-'unauthorized': 'неавторизовано',
 'uncheck all': 'зняти відмітку з усіх',
-'uninstall': 'вилучити',
 'Uninstall': 'Вилучити',
 'Unsupported webserver working mode: %s': 'Веб-сервер знаходиться в режимі, який не підтримується: %s',
 'update': 'оновити',
 'update all languages': 'оновити всі переклади',
 'Update:': 'Поновити:',
 'Upgrade': 'Оновити',
-'upgrade now': 'оновитись зараз',
 'upgrade now to %s': 'оновити зараз до %s',
-'upgrade_web2py': 'оновити web2py',
 'upload': 'завантажити',
 'Upload': 'Завантажити',
 'Upload a package:': 'Завантажити пакет:',
@@ -618,17 +623,28 @@
 'upload file:': 'завантажити файл:',
 'upload plugin file:': 'завантажити файл втулки:',
 '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': 'Контроль версій',
-'view': 'перегляд',
 'Views': 'Відображення (Views)',
 'views': 'відображення',
 'Warning!': 'Warning!',
@@ -641,20 +657,22 @@
 'web2py downgrade': 'повернення на попередню версію web2py',
 'web2py is up to date': 'web2py оновлено до актуальної версії',
 'web2py online debugger': 'оперативний ладнач (online debugger) web2py',
-'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",
 'YES': 'ТАК',
 'Yes': 'Yes',
 'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Ви також можете встановлювати/вилучати точки зупинок під час редагування першоджерел (sources), використовуючи кнопку "+/- точку зупинки"',
-'You can inspect variables using the console bellow': 'Ви можете досліджувати змінні, використовуючи інтерактивну консоль',
 'You can inspect variables using the console below': 'You can inspect variables using the console below',
+'You have 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,15 +15,28 @@
 '(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',
-'A new version of web2py is available': '新版的 web2py 已發行',
-'A new version of web2py is available: %s': '新版的 web2py 已發行: %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': 'Abort',
 'About': '關於',
 'About application': '關於本應用程式',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': '應用程式額外的程式碼',
 'Additional code for your application': 'Additional code for your application',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': '管理介面關閉原因是沒有設定管理員密碼 ',
@@ -31,13 +44,10 @@
 'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': '管理介面關閉原因是無法存取密碼檔',
 'Admin is disabled because insecure channel': '管理功能(Admin)在不安全連線環境下自動關閉',
-'Admin is disabled because unsecure channel': '管理功能(Admin)在不安全連線環境下自動關閉',
 'Admin language': 'Admin language',
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'administrative interface',
 'Administrator Password:': '管理員密碼:',
-'amy_ajax': 'amy_ajax',
-'and rename it (required):': '同時更名為(必要的):',
 'and rename it:': '同時更名為:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': '應用程式管理員',
@@ -50,14 +60,13 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': '確定要刪除插件 "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
-'Are you sure you want to uninstall application "%s"': '確定要移除應用程式 "%s"',
 'Are you sure you want to uninstall application "%s"?': '確定要移除應用程式 "%s"',
-'Are you sure you want to upgrade web2py now?': '確定現在要升級 web2py?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'arguments',
 'at char %s': 'at char %s',
@@ -66,9 +75,8 @@
 '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': '驗證',
+'Authentication code': 'Authentication code',
 'Autocomplete Python Code': 'Autocomplete Python Code',
-'Available databases and tables': '可提供的資料庫和資料表',
 'Available Databases and Tables': 'Available Databases and Tables',
 'back': '回復(back)',
 'Back to the plugins list': 'Back to the plugins list',
@@ -88,31 +96,26 @@
 'can be a git repo': 'can be a git repo',
 'Cancel': 'Cancel',
 'Cannot be empty': '不可空白',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': '無法編譯:應用程式中含有錯誤，請除錯後再試一次.',
 'Cannot compile: there are errors in your app:': '無法編譯: 在你的應用程式存在錯誤:',
 'cannot create file': '無法創建檔案',
 'cannot upload file "%(filename)s"': '無法上傳檔案 "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
 'change editor settings': 'change editor settings',
-'Change Password': '變更密碼',
-'change_password': '變更密碼',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': '全選',
 'Check for upgrades': 'Check for upgrades',
 'Check to delete': '打勾代表刪除',
-'Check to delete:': '打勾代表刪除:',
 'Checking for upgrades...': '檢查新版本中...',
 'Clean': '清除',
 'Clear': 'Clear',
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 'Clear RAM': 'Clear RAM',
-'click here for online examples': '點此處進入線上範例',
-'click here for the administrative interface': '點此處進入管理介面',
+'Click 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': '客戶端網址(IP)',
 'code': 'code',
 'Code listing': 'Code listing',
@@ -128,15 +131,11 @@
 'compiled application removed': '已移除已編譯的應用程式',
 'Condition': 'Condition',
 'continue': 'continue',
-'Controller': '控件',
 'Controllers': '控件',
 'controllers': '控件',
-'Copyright': '版權所有',
 'Count': 'Count',
 'Create': '創建',
 'create file with filename:': '創建檔案:',
-'create new application:': '創建新應用程式:',
-'Create new simple application': '創建應用程式',
 'Create/Upload': 'Create/Upload',
 'created by': '創建自',
 'Created by:': 'Created by:',
@@ -148,18 +147,14 @@
 'Current session': '目前網路連線資訊(session)',
 'currently running': 'currently running',
 'currently saved or': '現在存檔或',
-'customize me!': '請調整我!',
 'data uploaded': '資料已上傳',
 'Database': '資料庫',
-'database': '資料庫',
 'Database %s select': 'Database %s select',
-'database %s select': '已選擇 %s 資料庫',
 'Database administration': 'Database administration',
 'database administration': '資料庫管理',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
 'Date and Time': '日期和時間',
 'db': 'db',
-'DB Model': '資料庫模組',
 'Debug': 'Debug',
 'defines tables': '定義資料表',
 'Delete': '刪除',
@@ -168,7 +163,6 @@
 'delete plugin': '刪除插件',
 'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
 'Delete:': '刪除:',
-'delete_plugin': '刪除插件',
 'deleted after first hit': 'deleted after first hit',
 'Demo': 'Demo',
 'Deploy': 'Deploy',
@@ -181,8 +175,6 @@
 'Description': '描述',
 'Description:': 'Description:',
 'design': '設計',
-'DESIGN': '設計',
-'Design for': '設計為了',
 'Detailed traceback description': 'Detailed traceback description',
 'details': 'details',
 'direction: ltr': 'direction: ltr',
@@ -208,28 +200,23 @@
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
 'E-mail': '電子郵件',
-'EDIT': '編輯',
 'Edit': '編輯',
 'edit all': 'edit all',
 'Edit application': '編輯應用程式',
-'edit controller': '編輯控件',
 'edit controller:': 'edit controller:',
 'Edit current record': '編輯當前紀錄',
-'Edit Profile': '編輯設定檔',
-'Edit This App': '編輯本應用程式',
 'edit views:': '編輯視圖',
-'edit_language': '編輯語言檔',
 'Editing %s': 'Editing %s',
-'Editing file': '編輯檔案',
-'Editing file "%s"': '編輯檔案"%s"',
 'Editing Language file': '編輯語言檔案',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'Enterprise Web Framework': '企業網站平台',
 'Error': 'Error',
 'Error logs for "%(app)s"': '"%(app)s"的錯誤紀錄',
 'Error snapshot': 'Error snapshot',
@@ -266,6 +253,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',
@@ -278,10 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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': '群組編號',
-'Hello World': '嗨! 世界',
+'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',
@@ -289,7 +279,6 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'html編輯',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -299,15 +288,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',
-'Index': '索引',
-'index': '索引',
-'insert new': '插入新資料',
-'insert new %s': '插入新資料 %s',
 'inspect attributes': 'inspect attributes',
 'Install': '安裝',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': '已安裝應用程式',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': '內部錯誤',
@@ -318,14 +305,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"已創建或更新',
@@ -335,7 +330,6 @@
 'Last name': '姓',
 'Last Revision': 'Last Revision',
 'Last saved on:': '最後儲存時間:',
-'Layout': '網頁配置',
 'License for': '許可證',
 'License:': 'License:',
 'Line Nr': 'Line Nr',
@@ -343,17 +337,18 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': '載入中...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
-'login': '登入',
+'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',
 'Logout': '登出',
-'Lost Password': '密碼遺忘',
 'lost password': 'lost password',
 'Main Menu': '主選單',
 'Manage': 'Manage',
@@ -363,7 +358,6 @@
 'Manage Cache': 'Manage Cache',
 'Manage Students': 'Manage Students',
 'Memberships': 'Memberships',
-'Menu Model': '選單模組(menu)',
 'merge': '合併',
 'Models': '資料模組',
 'models': '資料庫模組',
@@ -376,6 +370,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': '新紀錄',
@@ -383,7 +378,6 @@
 'New simple application': 'New simple application',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': '往後 100 筆',
 'NO': '否',
 'no changes': 'no changes',
 'No databases in this application': '這應用程式不含資料庫',
@@ -395,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',
@@ -402,7 +398,6 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': '或是從逗號分隔檔(CSV)匯入',
-'or provide app url:': '或是提供應用程式的安裝網址:',
 'Origin': '原文',
 'Original/Translation': '原文/翻譯',
 'Overview': 'Overview',
@@ -411,20 +406,21 @@
 'Pack compiled': '打包已編譯資料',
 'Pack custom': 'Pack custom',
 'pack plugin': '打包插件',
-'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.',
-'peek': '選取',
 'Peeking at file': '選個文件',
 '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"',
 'Plugin "%s" in application': '在應用程式的插件 "%s"',
 'plugin not specified': 'plugin not specified',
@@ -437,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': '往前 100 筆',
 'Private files': 'Private files',
 'private files': 'private files',
+'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.',
@@ -455,15 +451,23 @@
 'Ram Cleared': 'Ram Cleared',
 '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 needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Reload routes': 'Reload routes',
 'Remember me (for 30 days)': '記住帳號(30 天)',
 'Remove compiled': '編譯檔案已移除',
@@ -472,10 +476,10 @@
 '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': '重設密碼',
-'resolve': '解決',
 'Resolve Conflict file': '解決衝突檔案',
 'response': 'response',
 'restart': 'restart',
@@ -488,7 +492,6 @@
 'Revision:': 'Revision:',
 'Role': '角色',
 'Roles': 'Roles',
-'Rows in table': '在資料表裏的資料',
 'Rows in Table': 'Rows in Table',
 'Rows selected': '筆資料被選擇',
 'rules are not defined': 'rules are not defined',
@@ -497,7 +500,6 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
 'Save': 'Save',
-'save': '儲存',
 'Save file:': 'Save file:',
 'Save file: %s': 'Save file: %s',
 'Save model as...': 'Save model as...',
@@ -506,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': '已選擇',
 'session': 'session',
 'session expired': '連線(session)已過時',
 'Session saved correctly': 'Session saved correctly',
@@ -514,6 +515,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:',
@@ -527,36 +529,29 @@
 'Start searching': 'Start searching',
 'Start wizard': 'Start wizard',
 'state': '狀態',
-'Static': 'Static',
 'static': '靜態檔案',
+'Static': 'Static',
 'Static files': '靜態檔案',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'Stylesheet': '網頁風格檔',
-'submit': '傳送',
 'Submit': '傳送',
+'submit': '傳送',
 'successful': 'successful',
-'Sure you want to delete this object?': '確定要刪除此物件?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': '資料表',
 'Table': 'Table',
-'Table name': '資料表名稱',
 'Temporary': 'Temporary',
 'test': '測試',
 'Testing application': '測試中的應用程式',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"查詢"是一個像 "db.表1.欄位1==\'值\'" 的條件式. 以"db.表1.欄位1==db.表2.欄位2"方式則相當於執行 JOIN SQL.',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': '應用程式邏輯 - 每個網址路徑對應到一個控件的函式',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'the data representation, define database tables and sets': '資料展現層 - 用來定義資料表和集合',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'the presentations layer, views are also known as templates': '外觀展現層 - 視圖有時也被稱為樣板',
 'Theme': 'Theme',
 'There are no controllers': '沒有控件(controllers)',
 'There are no models': '沒有資料庫模組(models)',
@@ -569,23 +564,21 @@
 'There are no views': '沒有視圖',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'these files are served without processing, your images go here': '這些檔案保留未經處理,你的影像檔在此',
+'This 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)',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
 'This will pull changes from the remote repo for application "%s"?': 'This will pull changes from the remote repo for application "%s"?',
 'This will push changes to the remote repo for application "%s".': 'This will push changes to the remote repo for application "%s".',
-'ticket': '問題單',
 'Ticket': '問題單',
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': '時間標記',
-'TM': 'TM',
 'to  previous version.': '到前一個版本',
 'To create a plugin, name a file/folder plugin_[name]': '檔案或目錄名稱以 plugin_開頭來創建插件',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
@@ -594,12 +587,11 @@
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
-'translation strings for the application': '翻譯此應用程式的字串',
 'Translation strings for the application': 'Translation strings for the application',
-'try': '嘗試',
 'try something like': '嘗試如',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'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': '無法做升級檢查',
@@ -607,15 +599,13 @@
 'unable to delete file "%(filename)s"': '無法刪除檔案 "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': '無法刪查插件檔 "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': '無法下載',
-'Unable to download app': '無法下載應用程式',
 'Unable to download app because:': '無法下載應用程式因為:',
-'Unable to download because': '因為下列原因無法下載:',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': '無法解析逗號分隔檔(csv)',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': '無法移除安裝 "%s"',
 'unable to upgrade because "%s"': '無法升級因為 "%s"',
 'uncheck all': '全不選',
@@ -626,32 +616,35 @@
 'Update:': '更新:',
 'Upgrade': 'Upgrade',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'upgrade web2py now',
-'upgrade_web2py': '升級 web2py',
 'upload': 'upload',
 'Upload': 'Upload',
-'Upload & install packed application': '上傳並安裝已打包的應用程式',
 'Upload a package:': 'Upload a package:',
 'Upload and install packed application': 'Upload and install packed application',
-'upload application:': '上傳應用程式:',
-'Upload existing application': '更新存在的應用程式',
 'upload file:': '上傳檔案:',
 'upload plugin file:': '上傳插件檔:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': '使用下列方式來組合更複雜的條件式, (...)&(...) 代表同時存在的條件, (...)|(...) 代表擇一的條件, ~(...)則代表反向條件.',
 'User': 'User',
+'User %(id)s 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',
 'Verify Password': '驗證密碼',
 'Version': '版本',
 'Versioning': 'Versioning',
-'versioning': '版本管理',
-'View': '視圖',
-'view': '視圖',
 'Views': '視圖',
 'views': '視圖',
 'Warning!': 'Warning!',
@@ -664,19 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py 已經是最新版',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'web2py 最近的 Tweets',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': '已升級 web2py ; 請重新啟動',
-'Welcome %s': '歡迎 %s',
-'Welcome to web2py': '歡迎使用 web2py',
+'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/zh.py

@@ -2,9 +2,6 @@
 {
 '!langcode!': 'zh-cn',
 '!langname!': '中文',
-'"browse"': '游览',
-'"save"': '"保存"',
-'"submit"': '"提交"',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"更新"是可配置项 如 "field1=\'newvalue\'",你无法在JOIN 中更新或删除',
 '"User Exception" debug mode. ': '"User Exception" debug mode. ',
 '%s': '%s',
@@ -14,20 +11,32 @@
 '%s students registered': '%s students registered',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access)': '(requires internet access)',
 '(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(就酱 "it-it")',
 '(version %s)': '(version %s)',
 '?': '?',
+'@markmin\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',
-'A new version of web2py is available': '新版本web2py已经可用',
-'A new version of web2py is available: %s': '新版本web2py已经可用: %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': 'Abort',
 'About': '关于',
 'About application': '关于这个应用',
 'Accept Terms': 'Accept Terms',
 'Add breakpoint': 'Add breakpoint',
-'additional code for your application': '给你的应用附加代码',
 'Additional code for your application': 'Additional code for your application',
 'Admin design page': 'Admin design page',
 'admin disabled because no admin password': '管理员需要设定密码，否则无法管理',
@@ -35,12 +44,10 @@
 'admin disabled because too many invalid login attempts': 'admin disabled because too many invalid login attempts',
 'admin disabled because unable to access password file': '需要可以操作密码文件，否则无法进行管理',
 'Admin is disabled because insecure channel': '管理因不安全通道而关闭',
-'Admin is disabled because unsecure channel': '管理因不稳定通道而关闭',
 'Admin language': 'Admin language',
 'Admin versioning page': 'Admin versioning page',
 'administrative interface': 'administrative interface',
 'Administrator Password:': '管理员密码:',
-'and rename it (required):': '重命名为 (必须):',
 'and rename it:': ' 重命名为:',
 'App does not exist or you are not authorized': 'App does not exist or you are not authorized',
 'appadmin': '应用管理',
@@ -53,14 +60,13 @@
 '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"?',
 'Are you sure you want to delete plugin "%s"?': 'Are you sure you want to delete plugin "%s"?',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
-'Are you sure you want to uninstall application "%s"': '你真确定要卸载应用 "%s"',
 'Are you sure you want to uninstall application "%s"?': '你真确定要卸载应用 "%s" ?',
-'Are you sure you want to upgrade web2py now?': 'Are you sure you want to upgrade web2py now?',
 'Are you sure?': 'Are you sure?',
 'arguments': 'arguments',
 'at char %s': 'at char %s',
@@ -69,8 +75,8 @@
 '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',
 'back': 'back',
 'Back to the plugins list': 'Back to the plugins list',
@@ -90,14 +96,13 @@
 'can be a git repo': 'can be a git repo',
 'Cancel': 'Cancel',
 'Cannot be empty': '不能不填',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': '无法编译: 应用中有错误,请修订后再试.',
 'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
 'cannot create file': '无法创建文件',
 'cannot upload file "%(filename)s"': '无法上传文件 "%(filename)s"',
 'Change Admin Password': 'Change Admin Password',
 'Change admin password': 'change admin password',
 'change editor settings': 'change editor settings',
-'Change Password': '修改密码',
+'Change password': 'Change password',
 'Changelog': 'Changelog',
 'check all': '检查所有',
 'Check for upgrades': 'check for upgrades',
@@ -108,11 +113,9 @@
 'Clear CACHE?': 'Clear CACHE?',
 'Clear DISK': 'Clear DISK',
 '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': '猛击查看是否有升级版本',
 'Client IP': '客户端IP',
 'code': 'code',
 'Code listing': 'Code listing',
@@ -133,8 +136,6 @@
 'Count': 'Count',
 'Create': 'create',
 'create file with filename:': '创建文件用这名:',
-'create new application:': '创建新应用:',
-'Create new simple application': '创建一个新应用',
 'Create/Upload': 'Create/Upload',
 'created by': '创建自',
 'Created by:': 'Created by:',
@@ -146,12 +147,9 @@
 'Current session': '当前会话',
 'currently running': 'currently running',
 'currently saved or': '保存当前的或',
-'customize me!': '定制俺!',
 'data uploaded': '数据已上传',
 'Database': 'Database',
-'database': '数据库',
 'Database %s select': 'Database %s select',
-'database %s select': '数据库 %s 选择',
 'Database administration': 'Database administration',
 'database administration': '数据库管理',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
@@ -177,8 +175,6 @@
 'Description': '描述',
 'Description:': 'Description:',
 'design': '设计',
-'DESIGN': '设计',
-'Design for': '设计:',
 'Detailed traceback description': 'Detailed traceback description',
 'details': 'details',
 'direction: ltr': 'direction: ltr',
@@ -204,26 +200,23 @@
 'download plugins': 'download plugins',
 'Download plugins from repository': 'Download plugins from repository',
 'E-mail': '邮箱:',
-'EDIT': '编辑',
 'Edit': '修改',
 'edit all': 'edit all',
 'Edit application': '修订应用',
-'edit controller': '修订控制器',
 'edit controller:': 'edit controller:',
 'Edit current record': '修订当前记录',
-'Edit Profile': '修订配置',
 'edit views:': 'edit views:',
 'Editing %s': 'Editing %s',
-'Editing file': '修订文件',
-'Editing file "%s"': '修订文件 %s',
 'Editing Language file': '修订语言文件',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Editor': 'Editor',
 'Email Address': 'Email Address',
+'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',
-'Enterprise Web Framework': '强悍的网络开发框架',
 'Error': 'Error',
 'Error logs for "%(app)s"': '"%(app)s" 的错误日志',
 'Error snapshot': 'Error snapshot',
@@ -240,13 +233,11 @@
 'exposes:': 'exposes:',
 'extends': '扩展',
 'failed to compile file because:': 'failed to compile file because:',
-'failed to reload module': '重新加载模块失败',
 'failed to reload module because:': 'failed to reload module because:',
 'File': 'File',
 'file "%(filename)s" created': '文件 "%(filename)s" 已创建',
 'file "%(filename)s" deleted': '文件 "%(filename)s" 已删除',
 'file "%(filename)s" uploaded': '文件 "%(filename)s" 已上传',
-'file "%(filename)s" was not deleted': '文件 "%(filename)s" 没删除',
 'file "%s" of %s restored': '文件"%s" 有关 %s 已重存',
 'file changed on disk': '硬盘上的文件已经修改',
 'file does not exist': '文件并不存在',
@@ -262,12 +253,12 @@
 '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',
 'GAE Password': 'GAE Password',
 'Generate': 'Generate',
-'Get from URL:': 'Get from URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globals##debug',
@@ -275,10 +266,12 @@
 'Google App Engine Deployment Interface': 'Google App Engine Deployment Interface',
 'Google Application Id': 'Google Application Id',
 'Goto': 'Goto',
-'graph model': 'graph model',
 'Graph Model': 'Graph Model',
+'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',
-'Hello World': '道可道，非常道；名可名，非常名',
+'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',
@@ -286,7 +279,6 @@
 'Hits': 'Hits',
 'Home': 'Home',
 'honored only if the expression evaluates to true': 'honored only if the expression evaluates to true',
-'htmledit': 'html编辑',
 'If start the downgrade, be patient, it may take a while to rollback': 'If start the downgrade, be patient, it may take a while to rollback',
 'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\n\t\tA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
@@ -296,13 +288,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',
-'insert new': '新插入',
-'insert new %s': '新插入 %s',
 'inspect attributes': 'inspect attributes',
 'Install': 'install',
 'Installation of %(plugin)s for %(app)s': 'Installation of %(plugin)s for %(app)s',
 'Installed applications': '已安装的应用',
+'Insufficient privileges': 'Insufficient privileges',
 'Interaction at %s line %s': 'Interaction at %s line %s',
 'Interactive console': 'Interactive console',
 'internal error': '内部错误',
@@ -313,21 +305,28 @@
 '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"被创建/更新',
 'Language files (static strings) updated': '语言文件(静态部分)已更新',
 'languages': '语言',
 'Languages': '语言',
-'languages updated': '语言已被刷新',
 'Last name': '名',
 'Last Revision': 'Last Revision',
 'Last saved on:': '最后保存于:',
@@ -338,17 +337,18 @@
 'lists by exception': 'lists by exception',
 'lists by ticket': 'lists by ticket',
 'Loading...': 'Loading...',
-'loading...': '载入中...',
 'Local Apps': 'Local Apps',
 'locals': 'locals',
 'Locals##debug': 'Locals##debug',
-'login': '登录',
+'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',
 'Logout': '注销',
-'Lost Password': '忘记密码',
 'lost password': 'lost password',
 'Main Menu': 'Main Menu',
 'Manage': 'Manage',
@@ -370,6 +370,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': '新记录',
@@ -377,7 +378,6 @@
 'New simple application': 'New simple application',
 'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': '后100行',
 'NO': '不',
 'no changes': 'no changes',
 'No databases in this application': '这应用没有数据库',
@@ -389,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',
@@ -396,8 +398,6 @@
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': '或者，从csv文件导入',
-'or provide app url:': 'or provide app url:',
-'or provide application url:': '或者，提供应用所在地址链接:',
 'Origin': '起源',
 'Original/Translation': '原始文件/翻译文件',
 'Overview': 'Overview',
@@ -406,9 +406,12 @@
 'Pack compiled': '包编译完',
 'Pack custom': 'Pack custom',
 'pack plugin': 'pack plugin',
-'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
 'Password': '密码',
 'password changed': 'password changed',
+'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 +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',
@@ -429,9 +433,9 @@
 'Preferences saved correctly': 'Preferences saved correctly',
 'Preferences saved on session only': 'Preferences saved on session only',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': '前100行',
 'Private files': 'Private files',
 'private files': 'private files',
+'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.',
@@ -447,24 +451,35 @@
 'Ram Cleared': 'Ram Cleared',
 '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 ID': '记录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',
@@ -477,7 +492,6 @@
 'Revision:': 'Revision:',
 'Role': '角色',
 'Roles': 'Roles',
-'Rows in table': '表行',
 'Rows in Table': 'Rows in Table',
 'Rows selected': '行选择',
 'rules are not defined': 'rules are not defined',
@@ -486,7 +500,6 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
 'Save': 'Save',
-'save': '保存',
 'Save file:': 'Save file:',
 'Save file: %s': 'Save file: %s',
 'Save model as...': 'Save model as...',
@@ -495,7 +508,6 @@
 'Screenshot %s': 'Screenshot %s',
 'Search': 'Search',
 'Select Files to Package': 'Select Files to Package',
-'selected': '已选',
 'session': 'session',
 'session expired': '会话过期',
 'Session saved correctly': 'Session saved correctly',
@@ -503,6 +515,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:',
@@ -516,35 +529,29 @@
 'Start searching': 'Start searching',
 'Start wizard': 'start wizard',
 'state': '状态',
-'Static': 'Static',
 'static': '静态文件',
+'Static': 'Static',
 'Static files': '静态文件',
 'Statistics': 'Statistics',
 'Step': 'Step',
 'step': 'step',
 'stop': 'stop',
-'submit': '提交',
 'Submit': 'Submit',
+'submit': '提交',
 'successful': 'successful',
-'Sure you want to delete this object?': '真的要删除这个对象?',
 'switch to : db': 'switch to : db',
 'switch to : filesystem': 'switch to : filesystem',
 'Tab width (# characters)': 'Tab width (# characters)',
-'table': '表',
 'Table': 'Table',
-'Table name': '表名',
 'Temporary': 'Temporary',
 'test': '测试',
 'Testing application': '应用测试',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '',
 'The app exists, was created by wizard, continue to overwrite!': 'The app exists, was created by wizard, continue to overwrite!',
 'The app exists, was NOT created by wizard, continue to overwrite!': 'The app exists, was NOT created by wizard, continue to overwrite!',
-'the application logic, each URL path is mapped in one exposed function in the controller': '应用逻辑:每个URL由控制器暴露的函式完成映射',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'the data representation, define database tables and sets': '数据表达式,定义数据库/表',
 'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'the presentations layer, views are also known as templates': '提交层/视图都在模板中可知',
 'Theme': 'Theme',
 'There are no controllers': '冇控制器',
 'There are no models': '冇模型s',
@@ -557,11 +564,11 @@
 'There are no views': '冇视图',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'these files are served without processing, your images go here': '',
+'This 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 模板',
 "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.": "This page can commit your changes to an openshift app repo and push them to your cloud instance. This assumes that you've already created the application instance using the web2py skeleton and have that repo somewhere on a filesystem that this web2py instance can access. This functionality requires GitPython installed and on the python path of the runtime that web2py is operating in.",
 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.': 'This page can upload your application to the Google App Engine computing cloud. Mind that you must first create indexes locally and this is done by installing the Google appserver and running the app locally with it once, or there will be errors when selecting records. Attention: deployment may take long time, depending on the network speed. Attention: it will overwrite your app.yaml. DO NOT SUBMIT TWICE.',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
@@ -572,22 +579,19 @@
 'Ticket Missing': 'Ticket Missing',
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': '时间戳',
-'TM': '',
 'to  previous version.': 'to  previous version.',
 'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
 'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
 'to use the debugger!': 'to use the debugger!',
-'to  previous version.': '退回前一版本',
 'toggle breakpoint': 'toggle breakpoint',
 'Toggle comment': 'Toggle comment',
 'Toggle Fullscreen': 'Toggle Fullscreen',
 'Traceback': 'Traceback',
-'translation strings for the application': '应用的翻译字串',
 'Translation strings for the application': 'Translation strings for the application',
-'try': '尝试',
 'try something like': '尝试',
 'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
+'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': '无法检查是否需要升级',
@@ -595,15 +599,13 @@
 'unable to delete file "%(filename)s"': '无法删除文件 "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'unable to delete file plugin "%(plugin)s"',
 'Unable to determine the line number!': 'Unable to determine the line number!',
-'Unable to download': '无法下载',
-'Unable to download app': '无法下载应用',
 'Unable to download app because:': 'Unable to download app because:',
-'Unable to download because': 'Unable to download because',
 'unable to download layout': 'unable to download layout',
 'unable to download plugin: %s': 'unable to download plugin: %s',
 'Unable to download the list of plugins': 'Unable to download the list of plugins',
 'unable to install plugin "%s"': 'unable to install plugin "%s"',
 'unable to parse csv file': '无法生成 cvs',
+'Unable to send email': 'Unable to send email',
 'unable to uninstall "%s"': '无法卸载 "%s"',
 'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
 'uncheck all': '反选全部',
@@ -614,29 +616,35 @@
 'Update:': '更新:',
 'Upgrade': 'Upgrade',
 'upgrade now to %s': 'upgrade now to %s',
-'upgrade web2py now': 'upgrade web2py now',
 'upload': 'upload',
 'Upload': 'Upload',
-'Upload & install packed application': 'Upload & install packed application',
 'Upload a package:': 'Upload a package:',
 'Upload and install packed application': 'Upload and install packed application',
-'upload application:': '提交已有的应用:',
-'Upload existing application': '上传已有应用',
 'upload file:': '提交文件:',
 'upload plugin file:': 'upload plugin file:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': '',
-'Use an url:': 'Use an url:',
 'User': 'User',
+'User %(id)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': '版本',
-'view': '视图',
 'Views': '视图',
 'views': '视图s',
 'Warning!': 'Warning!',
@@ -649,18 +657,22 @@
 'web2py downgrade': 'web2py downgrade',
 'web2py is up to date': 'web2py现在已经是最新的版本了',
 'web2py online debugger': 'web2py online debugger',
-'web2py Recent Tweets': 'twitter上的web2py进展实播',
 'web2py upgrade': 'web2py upgrade',
 'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
-'Welcome to web2py': '欢迎使用web2py',
+'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/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
-editor = default
+theme = twilight
+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) {
-                    if (t) {
-                        if (t == ':eval') eval(msg);
-                        else if (typeof t == 'string') $('#' + t).html(msg);
-                        else t(msg);
-                    }
-                }
-            });
+                success: success
+            };
+
+            //remove custom "done" option if exists
+            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 () {
-                var submit_button = $(this).find(web2py.formInputClickSelector);
-                web2py.disableElement(submit_button);
+            $(doc).on('submit', 'form', function (e) {
+                var submit_buttons = $(this).find(web2py.formInputClickSelector);
+                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);
-            if (flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown();
+            flash.text(message).addClass(status);
+            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)) {
-                    element.data('w2p_disable_with', element[method]());
+                if (!element.is(':file')) { // Altering file input values is not allowed.
+                    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><a href="#hooks" data-toggle="tab">Hooks</a></li>
+    <li class="nav-item"><a href="#alltables" data-toggle="tab" class="nav-link active">Tables</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 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 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-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/>
-    <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn btn-default">{{=T("export as csv file")}}</a>
+    <br/><br/>
+    <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:}}
-    {{=T('pygraphviz library not found')}}
-  {{elif not databases:}}
+  {{if not databases:}}  
     {{=T("No databases in this application")}}
-  {{else:}}	   
-    <div class="btn-group">
-      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-        <i class="icon-download"></i> {{=T('Save model as...')}}
-        <span class="caret"></span>
-      </a>
-      <ul class="dropdown-menu">
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['png'])}}">png</a></li>
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['svg'])}}">svg</a></li>
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['pdf'])}}">pdf</a></li>
-          <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'))}}
+  {{else:}}    
+    <div id="vis"></div>
+      <link rel="stylesheet" href="{{=URL('admin','static','css/d3_graph.css')}}"/>
+      <script>
+        // Define the d3 input data
+        {{from gluon.serializers import json }}
+        var nodes = {{=XML(json(nodes))}};
+        var links = {{=XML(json(links))}};
+        d3_graph();
+      </script>
   {{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",
-                     "sender", "subject")]
+                    ('id', 'uid', 'created', 'to',
+                     '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
-        hp = hpy()
+        from pympler.asizeof import asizeof
     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:
-                ram['bytes'] += hp.iso(value[1]).size
-                ram['objects'] += hp.iso(value[1]).count
+            if asizeof:
+                ram['bytes'] += asizeof(value[1])
+                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:
-                    disk['bytes'] += hp.iso(value[1]).size
-                    disk['objects'] += hp.iso(value[1]).count
+                if asizeof:
+                    disk['bytes'] += asizeof(value[1])
+                    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"
-    bgcolor = "#FFFFFF"
-    face = "Helvetica"
-    face_bold = "Helvetica Bold"
+    color = '#000000'
+    bgcolor = '#FFFFFF'
+    face = 'Helvetica'
+    face_bold = 'Helvetica Bold'
     border = 0
 
     rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor),
                            _colspan=3, _cellpadding=cellpadding,
-                           _align="center", _bgcolor=color)))
+                           _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']]
-    tables=[]
-    with_build_it=False
+    list_op = ['_%s_%s' %(h,m) for h in ['before', 'after'] for m in ['insert','update','delete']]
+    tables = []
+    with_build_it = False
     for db_str in sorted(databases):
         db = databases[db_str]
         for t in db.tables:
-            method_hooks=[]
+            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(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(LI(op['name']))
+            ul_t.append(UL([LI(A(f['funcname'], _class='editor_filelink', _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main
+
+
+# ##########################################################
+# d3 based model visualizations
+# ###########################################################
+
+def d3_graph_model():
+    ''' See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
+    and also the app_admin bg_graph_model function
+
+    Create a list of table dicts, called 'nodes'
+    '''
+
+    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 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.
-- **Talks to** SQLite, PostgreSQL, MySQL, MSSQL, FireBird, Oracle, IBM DB2, Informix, Ingres, and Google App Engine. 
+- **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, 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, 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) {
-                    if (t) {
-                        if (t == ':eval') eval(msg);
-                        else if (typeof t == 'string') $('#' + t).html(msg);
-                        else t(msg);
-                    }
-                }
-            });
+                success: success
+            };
+
+            //remove custom "done" option if exists
+            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 () {
-                var submit_button = $(this).find(web2py.formInputClickSelector);
-                web2py.disableElement(submit_button);
+            $(doc).on('submit', 'form', function (e) {
+                var submit_buttons = $(this).find(web2py.formInputClickSelector);
+                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);
-            if (flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown();
+            flash.text(message).addClass(status);
+            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)) {
-                    element.data('w2p_disable_with', element[method]());
+                if (!element.is(':file')) { // Altering file input values is not allowed.
+                    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><a href="#hooks" data-toggle="tab">Hooks</a></li>
+    <li class="nav-item"><a href="#alltables" data-toggle="tab" class="nav-link active">Tables</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 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 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-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/>
-    <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn btn-default">{{=T("export as csv file")}}</a>
+    <br/><br/>
+    <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:}}
-    {{=T('pygraphviz library not found')}}
-  {{elif not databases:}}
+  {{if not databases:}}  
     {{=T("No databases in this application")}}
-  {{else:}}	   
-    <div class="btn-group">
-      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-        <i class="icon-download"></i> {{=T('Save model as...')}}
-        <span class="caret"></span>
-      </a>
-      <ul class="dropdown-menu">
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['png'])}}">png</a></li>
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['svg'])}}">svg</a></li>
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['pdf'])}}">pdf</a></li>
-          <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'))}}
+  {{else:}}    
+    <div id="vis"></div>
+      <link rel="stylesheet" href="{{=URL('admin','static','css/d3_graph.css')}}"/>
+      <script>
+        // Define the d3 input data
+        {{from gluon.serializers import json }}
+        var nodes = {{=XML(json(nodes))}};
+        var links = {{=XML(json(links))}};
+        d3_graph();
+      </script>
   {{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).
-  It runs on Windows and most Unix systems, including <b>Linux</b> and <b>BSD</b>.
+  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) 
+  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).
-  To run from source, type:</p>
-{{=CODE("python2.7 web2py.py", language=None, counter='>', _class='boxCode')}}
+<p>With the binary packages, after download, just unzip it and then click on web2py.exe (Windows) or web2py (MacOs).</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. 
+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",
-                     "sender", "subject")]
+                    ('id', 'uid', 'created', 'to',
+                     '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
-        hp = hpy()
+        from pympler.asizeof import asizeof
     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:
-                ram['bytes'] += hp.iso(value[1]).size
-                ram['objects'] += hp.iso(value[1]).count
+            if asizeof:
+                ram['bytes'] += asizeof(value[1])
+                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:
-                    disk['bytes'] += hp.iso(value[1]).size
-                    disk['objects'] += hp.iso(value[1]).count
+                if asizeof:
+                    disk['bytes'] += asizeof(value[1])
+                    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"
-    bgcolor = "#FFFFFF"
-    face = "Helvetica"
-    face_bold = "Helvetica Bold"
+    color = '#000000'
+    bgcolor = '#FFFFFF'
+    face = 'Helvetica'
+    face_bold = 'Helvetica Bold'
     border = 0
 
     rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor),
                            _colspan=3, _cellpadding=cellpadding,
-                           _align="center", _bgcolor=color)))
+                           _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']]
-    tables=[]
-    with_build_it=False
+    list_op = ['_%s_%s' %(h,m) for h in ['before', 'after'] for m in ['insert','update','delete']]
+    tables = []
+    with_build_it = False
     for db_str in sorted(databases):
         db = databases[db_str]
         for t in db.tables:
-            method_hooks=[]
+            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(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(LI(op['name']))
+            ul_t.append(UL([LI(A(f['funcname'], _class='editor_filelink', _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main
+
+
+# ##########################################################
+# d3 based model visualizations
+# ###########################################################
+
+def d3_graph_model():
+    ''' See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
+    and also the app_admin bg_graph_model function
+
+    Create a list of table dicts, called 'nodes'
+    '''
+
+    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
-# - user is required for authentication and authorization
-# - download is for downloading files uploaded in the db (does streaming)
+# this file is released under public domain and you can use without limitations
 # -------------------------------------------------------------------------
 
-
+# ---- 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

@@ -3,13 +3,8 @@
 '!langcode!': 'ar',
 '!langname!': 'Arabic',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN',
-'%s %%(shop)': '%s %%(shop)',
-'%s %%(shop[0])': '%s %%(shop[0])',
-'%s %%{quark[0]}': '%s %%{quark[0]}',
 '%s %%{row} deleted': '%s %%{row} deleted',
 '%s %%{row} updated': '%s %%{row} updated',
-'%s %%{shop[0]}': '%s %%{shop[0]}',
-'%s %%{shop}': '%s %%{shop}',
 '%s selected': '%s selected',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
@@ -18,18 +13,30 @@
 '**%(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**Hello World**': '**مرحباً بالعالم**',
+'@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': 'نبذة',
 '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",
 'cache': 'cache',
 'Cache': 'Cache',
@@ -37,22 +44,22 @@
 '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': 'العناصر والإضافات',
 'Config.ini': 'Config.ini',
 'Controller': 'متحكم',
 'Copyright': 'الحقوق',
-'Created By': 'أنشئ بواسطة',
-'Created On': 'أنشئ في',
 'Current request': 'Current request',
 'Current response': 'Current response',
 'Current session': 'Current session',
-'customize me!': 'التخصيص',
 'data uploaded': 'data uploaded',
 'Database': 'قاعدة البيانات',
 'Database %s select': 'Database %s select',
@@ -76,71 +83,83 @@
 'E-mail': 'البريد الإلكتروني',
 'Edit current record': 'Edit current record',
 'Email and SMS': 'البريد الإلكتروني والرسالة النصية',
-'enter an integer between %(min)g and %(max)g': 'أدخل عدد صحيح بين %(min)g و %(man)g',
-'enter date and time as %(format)s': 'أدخل التاريخ والوقت كالنمط %(format)',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Errors': 'الأخطاء',
 'export as csv file': 'export as csv file',
 'FAQ': 'الأسئلة الشائعة',
 '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': 'مجموعات',
 'Hello World': 'مرحباً بالعالم',
-'Hello World  ## comment': ' مرحباً بالعالم',
-'Hello World## comment': 'مرحباً بالعالم',
 'Helping web2py': 'Helping 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': 'الرئيسية',
 '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',
-'Is Active': 'نشط',
+'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': 'أسم العائلة',
 'Layout': 'النسق',
-'Layout Plugins': 'نسّق الإضافات',
-'Layouts': 'لأنساق',
 'Live Chat': 'المحادثة الحيّة',
 'Log In': 'Log In',
 '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',
 'Memberships': 'Memberships',
 'Menu Model': 'قالب القوائم',
-'Modified By': 'عًدلت بواسطة',
-'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',
 'Origin': 'أصل',
-'Other Plugins': 'إضافات أخرى',
 '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 +168,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,28 +179,39 @@
 '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 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',
 'Rows in Table': 'Rows in Table',
 'Rows selected': 'Rows selected',
 'Save model as...': 'Save model as...',
-'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 +219,48 @@
 '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

@@ -3,145 +3,75 @@
 '!langcode!': 'ca',
 '!langname!': 'Català',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"actualizi" és una expressió opcional com "camp1=\'nou_valor\'". No es poden actualitzar o eliminar resultats de un JOIN',
-'%(nrows)s records found': '%(nrows)s registres trobats',
-'%s %%{position}': '%s %%{posició}',
 '%s %%{row} deleted': '%s %%{fila} %%{eliminada}',
 '%s %%{row} updated': '%s %%{fila} %%{actualitzada}',
 '%s selected': '%s %%{seleccionat}',
 '%Y-%m-%d': '%d/%m/%Y',
 '%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
 '(**%.0d MB**)': '(**%.0d MB**)',
-'(something like "it-it")': '(similar a "això-això")',
 '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 '?': '?',
+'@markmin\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 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',
+'A new password was emailed to you': 'A new password was emailed to you',
 'About': 'Sobre',
-'about': 'sobre',
-'About application': "Sobre l'aplicació",
 'Access Control': "Control d'Accés",
-'Add': 'Afegir',
-'Add Record': 'Afegeix registre',
-'additional code for your application': '`codi addicional per a la seva aplicació',
 'admin': 'admin',
-'admin disabled because no admin password': 'admin inhabilitat per falta de contrasenya',
-'admin disabled because not supported on google app engine': 'admin inhabilitat, no és suportat en GAE',
-'admin disabled because unable to access password file': 'admin inhabilitat, impossible accedir al fitxer con la contrasenya',
-'Admin is disabled because insecure channel': 'Admin inhabilitat, el canal no és segur',
-'Admin is disabled because unsecure channel': 'Admin inhabilitat, el canal no és segur',
-'Administrative interface': 'Interfície administrativa',
-'administrative interface': 'interfície administrativa',
-'Administrative Interface': 'Interfície Administrativa',
-'Administrator Password:': 'Contrasenya del Administrador:',
 'Ajax Recipes': 'Receptes AJAX',
-'An error occured, please %s the page': 'Hi ha hagut un error, per favor %s la pàgina',
 'An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
-'And': 'I',
-'and rename it (required):': 'i renombri-la (requerit):',
-'and rename it:': " i renombri'l:",
-'appadmin': 'appadmin',
+'API Example': 'API Example',
 'appadmin is disabled because insecure channel': 'admin inhabilitat, el canal no és segur',
-'application "%s" uninstalled': 'aplicació "%s" desinstal·lada',
-'application compiled': 'aplicació compilada',
-'application is compiled and cannot be designed': 'la aplicació està compilada i no pot ser modificada',
 'Apply changes': 'Aplicar canvis',
-'Appointment': 'Nomenament',
-'Are you sure you want to delete file "%s"?': 'Està segur que vol eliminar el arxiu "%s"?',
 'Are you sure you want to delete this object?': 'Està segur que vol esborrar aquest objecte?',
-'Are you sure you want to uninstall application "%s"': '¿Està segur que vol desinstalar la aplicació "%s"',
-'Are you sure you want to uninstall application "%s"?': '¿Està segur que vol desinstalar la aplicació "%s"?',
-'at': 'a',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENCIÓ: Inici de sessió requereix una connexió segura (HTTPS) o localhost.',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENCION: NO EJECUTE VARIAS PRUEBAS SIMULTANEAMENTE, NO SON THREAD SAFE.',
-'ATTENTION: you cannot edit the running application!': 'ATENCIO: no pot modificar la aplicació que està ejecutant-se!',
-'Authentication': 'Autenticació',
-'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!',
+'Authentication code': 'Authentication code',
 'Available Databases and Tables': 'Bases de dades i taules disponibles',
-'Back': 'Endarrera',
-'Buy this book': 'Compra aquest lllibre',
 "Buy web2py's book": "Buy web2py's book",
-'Cache': 'Caché',
 'cache': 'caché',
+'Cache': 'Caché',
 'Cache Cleared': 'Caché Netejada',
 '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': 'Claus de la Caché',
-'cache, errors and sessions cleaned': 'caché, errors i sessions eliminats',
 'Cannot be empty': 'No pot estar buit',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'No se pot compilar: hi ha errors en la seva aplicació. Depuri, corregeixi errors i torni a intentar-ho.',
-'cannot upload file "%(filename)s"': 'no és possible pujar fitxer "%(filename)s"',
 'Change Password': 'Canviï la Contrasenya',
 'Change password': 'Canviï la contrasenya',
-'change password': 'canviï la contrasenya',
-'Changelog': 'Changelog',
-'check all': 'marcar tots',
 'Check to delete': 'Marqui per a eliminar',
-'choose one': 'escolliu un',
-'clean': 'neteja',
-'Clear': 'Netejar',
 'Clear CACHE?': 'Netejar Memòrica Cau?',
 'Clear DISK': 'Netejar DISC',
 'Clear RAM': 'Netejar RAM',
 'Click on the link %(link)s to reset your password': "Cliqui en l'enllaç %(link)s per a reiniciar la seva contrasenya",
-'click to check for upgrades': 'feu clic per buscar actualitzacions',
-'client': 'cliente',
 'Client IP': 'IP del Client',
-'Close': 'Tancar',
-'Comma-separated export including columns not shown; fields from other tables are exported as raw values for faster export': 'Comma-separated export including columns not shown; fields from other tables are exported as raw values for faster export',
-'Comma-separated export of visible columns. Fields from other tables are exported as they appear on-screen but this may be slow for many rows': 'Comma-separated export of visible columns. Fields from other tables are exported as they appear on-screen but this may be slow for many rows',
 'Community': 'Comunitat',
-'compile': 'compilar',
-'compiled application removed': 'aplicació compilada eliminada',
 'Components and Plugins': 'Components i Plugins',
 'Config.ini': 'Config.ini',
-'contains': 'conté',
 'Controller': 'Controlador',
-'Controllers': 'Controladors',
-'controllers': 'controladors',
 'Copyright': 'Copyright',
-'Correo electrónico invàlid': 'Correu electrònic invàlid',
-'create file with filename:': 'crear el fitxer amb el nom:',
-'Create new application': 'Crear una nova aplicació',
-'create new application:': 'crear una nova aplicació:',
-'Create New Page': 'Crear Pàgina Nova',
-'Create Page from Slug': 'Create Page from Slug',
-'Created By': 'Creat Per',
-'Created On': 'Creat a',
-'CSV': 'CSV',
-'CSV (hidden cols)': 'CSV (columnas ocultes)',
 'Current request': 'Sol·licitud en curs',
 'Current response': 'Resposta en curs',
 'Current session': 'Sessió en curs',
-'currently saved or': 'actualment guardat o',
-'customize me!': "¡Adapta'm!",
 'data uploaded': 'dades pujades',
 'Database': 'Base de dades',
 'Database %s select': 'selecció a base de dades %s',
-'database administration': 'administració de base de dades',
 'Database Administration (appadmin)': 'Administració de Base de Dades (appadmin)',
-'Date and Time': 'Data i Hora',
-'DB': 'BDD',
 'db': 'bdd',
 'DB Model': 'Model BDD',
-'defines tables': 'defineix taules',
-'Delete': 'Eliminar',
-'delete': 'eliminar',
-'delete all checked': 'eliminar marcats',
 'Delete:': 'Eliminar:',
 'Demo': 'Demostració',
-'Deploy on Google App Engine': 'Desplegament a Google App Engine',
 'Deployment Recipes': 'Receptes de desplegament',
 'Description': 'Descripció',
 'design': 'diseny',
-'DESIGN': 'DISENY',
 'Design': 'Design',
-'Design for': 'Diseny per a',
-'detecting': 'detectant',
 'DISK': 'DISC',
 'Disk Cache Keys': 'Claus de Caché en Disc',
 'Disk Cleared': 'Disc netejat',
@@ -151,194 +81,96 @@
 'done!': '¡fet!',
 'Download': 'Descàrregues',
 'E-mail': 'Correu electrònic',
-'edit': 'editar',
-'EDIT': 'EDITAR',
-'Edit': 'Editar',
-'Edit application': 'Editar aplicació',
-'edit controller': 'editar controlador',
 'Edit current record': 'Editar el registre actual',
-'Edit Menu': 'Editar Menu',
-'Edit Page': 'Editar Pàgina',
-'Edit Page Media': 'Edit Page Media',
-'Edit Profile': 'Editar Perfil',
-'edit profile': 'editar perfil',
-'Edit This App': 'Editi aquesta App',
-'Editing file': 'Editant fitxer',
-'Editing file "%s"': 'Editant fitxer "%s"',
-'El fitxer ha de ser PDF': 'El fitxer ha de ser PDF',
-'El fitxer ha de ser PDF o XML': 'El fitxer ha de ser PDF o XML',
-'Email': 'Email',
 'Email and SMS': 'Correu electrònic i SMS',
 'Email sent': 'Correu electrònic enviat',
-'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',
-'enter a value': 'entri un valor',
-'Enter a value': 'Entri un valor',
-'Enter an integer between %(min)g and %(max)g': 'Entri un numero enter entre %(min)g i %(max)g',
-'enter an integer between %(min)g and %(max)g': 'entri numero enter entre %(min)g i %(max)g',
-'enter date and time as %(format)s': 'entri data i hora com %(format)s',
-'Enter from %(min)g to %(max)g characters': 'Entri des de %(min)g a %(max)g caràcters',
-'Enter valid filename': 'Entri nom de fitxer vàlid',
-'Error logs for "%(app)s"': 'Bitàcora de errors a "%(app)s"',
-'errors': 'errors',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Errors': 'Errors',
-'Errors in form, please check it out.': 'Hi ha errors en el formulari, per favor comprovi-ho.',
 'export as csv file': 'exportar com fitxer CSV',
-'Export:': 'Exportar:',
-'exposes': 'exposa',
-'extends': 'extén',
-'failed to reload module': 'la recàrrega del mòdul ha fallat',
 'FAQ': 'FAQ',
-'file': 'fitxer',
-'file "%(filename)s" created': 'fitxer "%(filename)s" creat',
-'file "%(filename)s" deleted': 'fitxer "%(filename)s" eliminat',
-'file "%(filename)s" uploaded': 'fitxer "%(filename)s" pujat',
-'file "%(filename)s" was not deleted': 'fitxer "%(filename)s" no fou eliminat',
-'file "%s" of %s restored': 'fitxer "%s" de %s restaurat',
-'file ## download': 'file ',
-'file changed on disk': 'fitxer modificat en el disco',
-'file does not exist': 'fitxer no existeix',
-'file saved on %(time)s': 'fitxer guardat a %(time)s',
-'file saved on %s': 'fitxer guardat a %s',
 'First name': 'Nom',
-'Forgot username?': 'Ha oblidat el nom de usuari?',
 'Forms and Validators': 'Formularis i validadors',
 'Free Applications': 'Aplicacions Lliures',
-'Functions with no doctests will result in [passed] tests.': 'Funcions sense doctests equivalen a pruebas [aceptades].',
+'Function disabled': 'Function disabled',
 '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',
-'Hello': 'Hola',
 'Hello World': 'Hola Món',
-'help': 'ajuda',
 'Helping web2py': 'Helping 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': 'Inici',
-'Hosted by': 'Hosted by',
 'How did you get here?': 'Com has arribat aquí?',
-'HTML': 'HTML',
-'HTML export of visible columns': 'HTML export de columnes visibles',
-'htmledit': 'htmledit',
-'Impersonate': 'Suplantar',
 'import': 'importar',
 'Import/Export': 'Importar/Exportar',
-'in': 'a',
-'includes': 'inclou',
-'Index': 'Índex',
-'insert new': 'inserti nou',
-'insert new %s': 'inserti nou %s',
-'Installed applications': 'Aplicacions instalades',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Insufficient privileges': 'Privilegis insuficients',
-'internal error': 'error intern',
 'Internal State': 'Estat Intern',
 'Introduction': 'Introducció',
-'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',
-'Is Active': 'Està Actiu',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Clau',
-'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',
-'Languages': 'Llenguatges',
-'languages updated': 'llenguatges actualitzats',
+'Key verified': 'Key verified',
 'Last name': 'Cognom',
-'Last saved on:': 'Guardat a:',
 'Layout': 'Diseny de pàgina',
-'Layout Plugins': 'Plugins de disseny',
-'Layouts': 'Dissenys de pàgines',
-'License for': 'Llicència per a',
 'Live Chat': 'Xat en viu',
-'loading...': 'carregant...',
 'Log In': 'Log In',
-'Log Out': 'Log Out',
 'Logged in': 'Sessió iniciada',
 'Logged out': 'Sessió finalitzada',
 'Login': 'Inici de sessió',
-'login': 'inici de sessió',
 'Login disabled by administrator': 'Inici de sessió inhabilitat pel administrador',
-'Login to the Administrative Interface': 'Inici de sessió per a la Interfície Administrativa',
-'logout': 'fi de sessió',
 'Logout': 'Fi de sessió',
 'Lost Password': 'Contrasenya perdida',
-'Lost password?': 'Ha oblidat la contrasenya?',
-'lost password?': '¿ha oblidat la contrasenya?',
-'Main Menu': 'Menú principal',
+'Lost your password?': 'Lost your password?',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
 'Manage Cache': 'Gestionar la Caché',
 'Memberships': 'Memberships',
 'Menu Model': 'Model "menu"',
-'merge': 'combinar',
-'Models': 'Models',
-'models': 'models',
-'Modified By': 'Modificat Per',
-'Modified On': 'Modificat A',
-'Modules': 'Mòduls',
-'modules': 'mòduls',
-'must be YYYY-MM-DD HH:MM:SS!': '¡debe ser DD/MM/YYYY HH:MM:SS!',
-'must be YYYY-MM-DD!': '¡debe ser DD/MM/YYYY!',
 'My Sites': 'Els Meus Llocs',
 'Name': 'Nombre',
-'New': 'Nuevo',
-'New %(entity)s': 'Nou %(entity)s',
-'new application "%s" created': 'nova aplicació "%s" creada',
 'New password': 'Contrasenya nova',
 'New Record': 'Registre nou',
 'new record inserted': 'nou registre insertat',
-'New Search': 'Cerca nova',
 'next %s rows': 'següents %s files',
-'next 100 rows': '100 files següents',
-'NO': 'NO',
 'No databases in this application': 'No hi ha bases de dades en esta aplicació',
-'No records found': "No s'han trobat registres",
-'Not authorized': 'No autoritzat',
-'not in': 'no a',
 'Number of entries: **%s**': 'Number of entries: **%s**',
 'Object or table name': 'Nom del objecte o taula',
 'Old password': 'Contrasenya anterior',
 'Online book': 'Online book',
 'Online examples': 'Ejemples en línia',
-'Or': 'O',
 'or import from csv file': 'o importar desde fitxer CSV',
-'or provide application url:': 'o proveeix URL de la aplicació:',
 'Origin': 'Origen',
-'Original/Translation': 'Original/Traducció',
-'Other Plugins': 'Altres Plugins',
 'Other Recipes': 'Altres Receptes',
 'Overview': 'Resum',
-'pack all': 'empaquetar tot',
-'pack compiled': 'empaquetar compilats',
 'Password': 'Contrasenya',
 'Password changed': 'Contrasenya cambiada',
 "Password fields don't match": 'Els camps de contrasenya no coincideixen',
 'Password reset': 'Reinici de contrasenya',
-'Peeking at file': 'Visualitzant fitxer',
+'Password retrieve': 'Password retrieve',
 'Permission': 'Permís',
 'Permissions': 'Permisos',
-'Phone': 'Telèfon',
 'please input your password again': 'si us plau, entri un altre cop la seva contrasenya',
 'Plugins': 'Plugins',
 'Powered by': 'Aquest lloc utilitza',
 'Preface': 'Prefaci',
-'Presentar Factures': 'Presentar Factures',
-'Presentar factures': 'Presentar factures',
 'previous %s rows': '%s files prèvies',
-'previous 100 rows': '100 files anteriors',
 'Profile': 'Perfil',
 'Profile updated': 'Perfil actualitzat',
 'pygraphviz library not found': 'pygraphviz library not found',
 'Python': 'Python',
-'Query Not Supported: %s': 'Consulta No Suportada: %s',
 'Query:': 'Consulta:',
 'Quick Examples': 'Exemple Ràpids',
 'RAM': 'RAM',
@@ -348,117 +180,55 @@
 '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',
-'Ref APB': 'Ref APB',
-'register': "registri's",
+'Record ID': 'ID de Registre',
+'Record Updated': 'Record Updated',
 '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)",
-'remove compiled': 'eliminar compilades',
 'Request reset password': 'Sol·licitud de restabliment de contrasenya',
-'Reset password': 'Reiniciar contrasenya',
 'Reset Password key': 'Restaurar Clau de la Contrasenya',
-'Resolve Conflict file': 'Resolgui el Conflicte de fitxer',
-'restore': 'restaurar',
-'Retrieve username': 'Recuperar nom de usuari',
-'revert': 'revertir',
 'Role': 'Rol',
 'Roles': 'Rols',
 'Rows in Table': 'Files a la taula',
 'Rows selected': 'Files seleccionades',
-'save': 'guardar',
 'Save model as...': 'Save model as...',
-'Saved file hash:': 'Hash del fitxer guardat:',
-'Search': 'Buscar',
-'Search Pages': 'Search Pages',
-'Semantic': 'Semàntica',
 'Services': 'Serveis',
-'session expired': 'sessió expirada',
-'shell': 'terminal',
 'Sign Up': 'Sign Up',
-'site': 'lloc',
+'Sign up': 'Sign up',
 'Size of cache:': 'Mida de la Caché:',
-'Slug': 'Slug',
-'some files could not be removed': 'algunos archivos no pudieron ser removidos',
-'Spreadsheet-optimised export of tab-separated content including hidden columns. May be slow': 'Spreadsheet-optimised export of tab-separated content including hidden columns. May be slow',
-'Spreadsheet-optimised export of tab-separated content, visible columns only. May be slow.': 'Spreadsheet-optimised export of tab-separated content, visible columns only. May be slow.',
-'start': 'inici',
-'Start building a new search': 'Start building a new search',
-'starts with': 'comença per',
 'state': 'estat',
-'static': 'estàtics',
-'Static files': 'Fitxers estàtics',
 'Statistics': 'Estadístiques',
 'Stylesheet': "Fulla d'estil",
-'Submit': 'Enviar',
 'submit': 'enviar',
-'Success!': 'Correcte!',
+'Submit': 'Enviar',
 'Support': 'Suport',
-'Sure you want to delete this object?': '¿Està segur que vol eliminar aquest objecte?',
 'Table': 'taula',
-'Table name': 'Nom de la taula',
-'test': 'provar',
-'Testing application': 'Provant aplicació',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La "consulta" és una condición com "db.tabla1.campo1==\'valor\'". Algo com "db.tabla1.campo1==db.tabla2.campo2" resulta en un JOIN SQL.',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'la lògica de la aplicació, cada ruta URL es mapeja en una funció exposada en el controlador',
 'The Core': 'El Nucli',
-'the data representation, define database tables and sets': 'la representació de dades, defineix taules i conjunts de base de dades',
 'The output of the file is a dictionary that was rendered by the view %s': 'El resultat de aquesta funció és un diccionari que és desplegat per la vista %s',
-'the presentations layer, views are also known as templates': 'la capa de presentació, les vistes també són anomenades plantilles',
 'The Views': 'Les Vistes',
-'There are no controllers': 'No hi ha controladors',
-'There are no models': 'No hi ha models',
-'There are no modules': 'No hi ha mòduls',
-'There are no static files': 'No hi ha fitxers estàtics',
-'There are no translators, only default language is supported': 'No hi ha traductors, només el llenguatge per defecte és suportat',
-'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',
-'Ticket': 'Tiquet',
 'Time in Cache (h:m:s)': 'Temps en Caché (h:m:s)',
 'Timestamp': 'Marca de temps',
-'Title': 'Títol',
-'to  previous version.': 'a la versió prèvia.',
-'To emulate a breakpoint programatically, write:': 'Emular un punto de ruptura programàticament, escribir:',
-'to use the debugger!': 'usar el depurador!',
-'toggle breakpoint': 'alternar punt de ruptura',
-'Toggle comment': 'Alternar comentari',
-'Toggle Fullscreen': 'Alternar pantalla completa',
-'too short': 'massa curt',
 'Traceback': 'Traceback',
-'translation strings for the application': 'cadenes de caracters de traducció per a la aplicació',
-'try': 'intenti',
-'try something like': 'intenti algo com',
-'TSV (Excel compatible)': 'TSV (compatible Excel)',
-'TSV (Excel compatible, hidden cols)': 'TSV (compatible Excel, columnes ocultes)',
-'TSV (Spreadsheets)': 'TSV (Fulls de càlcul)',
-'TSV (Spreadsheets, hidden cols)': 'TSV (Fulls de càlcul, columnes amagades)',
 'Twitter': 'Twitter',
-'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ó',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'unable to parse csv file': 'no és possible analitzar el fitxer CSV',
-'unable to uninstall "%s"': 'no és possible instalar "%s"',
-'uncheck all': 'desmarcar tots',
-'uninstall': 'desinstalar',
-'unknown': 'desconocido',
-'update': 'actualitzar',
-'update all languages': 'actualitzar tots els llenguatges',
+'Unable to send email': 'Unable to send email',
 'Update:': 'Actualizi:',
-'upload application:': 'pujar aplicació:',
-'Upload existing application': 'Puji aquesta aplicació',
-'upload file:': 'puji fitxer:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, i ~(...) para NOT, para crear consultas més complexes.',
 'User': 'Usuari',
 'User %(id)s is impersonating %(other_id)s': 'El usuari %(id)s està suplantant %(other_id)s',
@@ -466,47 +236,31 @@
 '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 %(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ó",
-'User Id': 'Id de Usuari',
+'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 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',
-'value already in database or empty': 'el valor ya existeix en la base de dades o està buit',
-'value not allowed': 'valor no permès',
-'Value not in database': 'El valor no està a la base de dades',
-'value not in database': 'el valor no està a la base de dades',
 'Verify Password': 'Verificar Contrasenya',
-'Version': 'Versió',
-'versioning': 'versions',
 'Videos': 'Videos',
 'View': 'Vista',
-'view': 'vista',
-'View %(entity)s': 'Veure %(entity)s',
-'View Page': 'View Page',
-'Views': 'Vistes',
-'views': 'vistes',
-'web2py is up to date': 'web2py està actualitzat',
-'web2py Recent Tweets': 'Tweets Recents de web2py',
-'Welcome': 'Benvingut',
-'Welcome %s': 'Benvingut %s',
-'Welcome to web2py': 'Benvingut a 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 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 Page': 'Wiki Page',
+'Wiki Example': 'Wiki Example',
 'Working...': 'Treballant ...',
-'XML': 'XML',
-'XML export of columns shown': 'XML export of columns shown',
-'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

@@ -3,342 +3,172 @@
 '!langcode!': 'cs-cz',
 '!langname!': 'čeština',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': 'Kolonka "Upravit" je nepovinný výraz, například "pole1=\'nováhodnota\'". Výsledky databázového JOINu nemůžete mazat ani upravovat.',
-'"User Exception" debug mode. An error ticket could be issued!': '"User Exception" debug mode. An error ticket could be issued!',
-'%%{Row} in Table': '%%{řádek} v tabulce',
-'%%{Row} selected': 'označených %%{řádek}',
 '%s %%{row} deleted': '%s smazaných %%{záznam}',
 '%s %%{row} updated': '%s upravených %%{záznam}',
 '%s selected': '%s označených',
 '%Y-%m-%d': '%d.%m.%Y',
 '%Y-%m-%d %H:%M:%S': '%d.%m.%Y %H:%M:%S',
 '(**%.0d MB**)': '(**%.0d MB**)',
-'(requires internet access)': '(vyžaduje připojení k internetu)',
-'(requires internet access, experimental)': '(requires internet access, experimental)',
-'(something like "it-it")': '(například "cs-cs")',
 '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
 '?': '?',
-'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(soubor **gluon/contrib/plural_rules/%s.py** nenalezen)',
-'@markmin\x01Searching: **%s** %%{file}': 'Hledání: **%s** %%{soubor}',
+'@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': 'O programu',
-'About application': 'O aplikaci',
 'Access Control': 'Řízení přístupu',
-'Add breakpoint': 'Přidat bod přerušení',
-'Additional code for your application': 'Další kód pro Vaši aplikaci',
 'admin': 'admin',
-'Admin design page': 'Admin design page',
-'Admin language': 'jazyk rozhraní',
-'Administrative interface': 'pro administrátorské rozhraní klikněte sem',
-'administrative interface': 'rozhraní pro správu',
-'Administrative Interface': 'Administrátorské rozhraní',
-'Administrator Password:': 'Administrátorské heslo:',
 'Ajax Recipes': 'Recepty s ajaxem',
-'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:',
-'appadmin': 'appadmin',
+'API Example': 'API Example',
 'appadmin is disabled because insecure channel': 'appadmin je zakázaná bez zabezpečeného spojení',
-'Application': 'Application',
-'application "%s" uninstalled': 'application "%s" odinstalována',
-'application compiled': 'aplikace zkompilována',
-'Application name:': 'Název aplikace:',
-'are not used': 'nepoužita',
-'are not used yet': 'ještě nepoužita',
+'Apply changes': 'Apply changes',
 'Are you sure you want to delete this object?': 'Opravdu chcete odstranit tento objekt?',
-'Are you sure you want to uninstall application "%s"?': 'Opravdu chcete odinstalovat aplikaci "%s"?',
-'arguments': 'arguments',
-'at char %s': 'at char %s',
-'at line %s': 'at line %s',
-'ATTENTION:': 'ATTENTION:',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
+'Authentication code': 'Authentication code',
 'Available Databases and Tables': 'Dostupné databáze a tabulky',
-'back': 'zpět',
-'Back to wizard': 'Back to wizard',
-'Basics': 'Basics',
-'Begin': 'Začít',
-'breakpoint': 'bod přerušení',
-'Breakpoints': 'Body přerušení',
-'breakpoints': 'body přerušení',
-'Buy this book': 'Koupit web2py knihu',
 "Buy web2py's book": "Buy web2py's book",
-'Cache': 'Cache',
 'cache': 'cache',
+'Cache': 'Cache',
 'Cache Cleared': 'Cache Cleared',
 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Cache Keys': 'Klíče cache',
-'cache, errors and sessions cleaned': 'cache, chyby a relace byly pročištěny',
-'can be a git repo': 'může to být git repo',
-'Cancel': 'Storno',
 'Cannot be empty': 'Nemůže být prázdné',
-'Change Admin Password': 'Změnit heslo pro správu',
-'Change admin password': 'Změnit heslo pro správu aplikací',
+'Change Password': 'Change Password',
 'Change password': 'Změna hesla',
-'check all': 'vše označit',
-'Check for upgrades': 'Zkusit aktualizovat',
 'Check to delete': 'Označit ke smazání',
-'Check to delete:': 'Označit ke smazání:',
-'Checking for upgrades...': 'Zjišťuji, zda jsou k dispozici aktualizace...',
-'Clean': 'Pročistit',
 'Clear CACHE?': 'Vymazat CACHE?',
 'Clear DISK': 'Vymazat DISK',
 'Clear RAM': 'Vymazat RAM',
-'Click row to expand traceback': 'Pro rozbalení stopy, klikněte na řádek',
-'Click row to view a ticket': 'Pro zobrazení chyby (ticketu), klikněte na řádku...',
+'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Client IP': 'IP adresa klienta',
-'code': 'code',
-'Code listing': 'Code listing',
-'collapse/expand all': 'vše sbalit/rozbalit',
 'Community': 'Komunita',
-'Compile': 'Zkompilovat',
-'compiled application removed': 'zkompilovaná aplikace smazána',
 'Components and Plugins': 'Komponenty a zásuvné moduly',
-'Condition': 'Podmínka',
 'Config.ini': 'Config.ini',
-'continue': 'continue',
 'Controller': 'Kontrolér (Controller)',
-'Controllers': 'Kontroléry',
-'controllers': 'kontroléry',
 'Copyright': 'Copyright',
-'Count': 'Počet',
-'Create': 'Vytvořit',
-'create file with filename:': 'vytvořit soubor s názvem:',
-'created by': 'vytvořil',
-'Created By': 'Vytvořeno - kým',
-'Created On': 'Vytvořeno - kdy',
-'crontab': 'crontab',
 'Current request': 'Aktuální požadavek',
 'Current response': 'Aktuální odpověď',
 'Current session': 'Aktuální relace',
-'currently running': 'právě běží',
-'currently saved or': 'uloženo nebo',
-'customize me!': 'upravte mě!',
 'data uploaded': 'data nahrána',
 'Database': 'Rozhraní databáze',
 'Database %s select': 'databáze %s výběr',
-'Database administration': 'Database administration',
-'database administration': 'správa databáze',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
-'Date and Time': 'Datum a čas',
-'day': 'den',
 'db': 'db',
 'DB Model': 'Databázový model',
-'Debug': 'Ladění',
-'defines tables': 'defines tables',
-'Delete': 'Smazat',
-'delete': 'smazat',
-'delete all checked': 'smazat vše označené',
-'delete plugin': 'delete plugin',
-'Delete this file (you will be asked to confirm deletion)': 'Smazat tento soubor (budete požádán o potvrzení mazání)',
 'Delete:': 'Smazat:',
-'deleted after first hit': 'smazat po prvním dosažení',
 'Demo': 'Demo',
-'Deploy': 'Nahrát',
-'Deploy on Google App Engine': 'Nahrát na Google App Engine',
-'Deploy to OpenShift': 'Nahrát na OpenShift',
 'Deployment Recipes': 'Postupy pro deployment',
 'Description': 'Popis',
 'design': 'návrh',
 'Design': 'Design',
-'Detailed traceback description': 'Podrobný výpis prostředí',
-'details': 'podrobnosti',
-'direction: ltr': 'směr: ltr',
-'Disable': 'Zablokovat',
 'DISK': 'DISK',
 'Disk Cache Keys': 'Klíče diskové cache',
 'Disk Cleared': 'Disk smazán',
 '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.',
-'docs': 'dokumentace',
 'Documentation': 'Dokumentace',
 "Don't know what to do?": 'Nevíte kudy kam?',
 'done!': 'hotovo!',
 'Download': 'Stáhnout',
-'download layouts': 'stáhnout moduly rozvržení stránky',
-'download plugins': 'stáhnout zásuvné moduly',
 'E-mail': 'E-mail',
-'Edit': 'Upravit',
-'edit all': 'edit all',
-'Edit application': 'Správa aplikace',
-'edit controller': 'edit controller',
 'Edit current record': 'Upravit aktuální záznam',
-'Edit Profile': 'Upravit profil',
-'edit views:': 'upravit pohled:',
-'Editing file "%s"': 'Úprava souboru "%s"',
-'Editing Language file': 'Úprava jazykového souboru',
-'Editing Plural Forms File': 'Editing Plural Forms File',
 'Email and SMS': 'Email a SMS',
-'Enable': 'Odblokovat',
-'enter a number between %(min)g and %(max)g': 'zadejte číslo mezi %(min)g a %(max)g',
-'enter an integer between %(min)g and %(max)g': 'zadejte celé číslo mezi %(min)g a %(max)g',
-'Error': 'Chyba',
-'Error logs for "%(app)s"': 'Seznam výskytu chyb pro aplikaci "%(app)s"',
-'Error snapshot': 'Snapshot chyby',
-'Error ticket': 'Ticket chyby',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Errors': 'Chyby',
-'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
-'Exception %s': 'Exception %s',
-'Exception instance attributes': 'Prvky instance výjimky',
-'Expand Abbreviation': 'Expand Abbreviation',
 'export as csv file': 'exportovat do .csv souboru',
-'exposes': 'vystavuje',
-'exposes:': 'vystavuje funkce:',
-'extends': 'rozšiřuje',
-'failed to compile file because:': 'soubor se nepodařilo zkompilovat, protože:',
 'FAQ': 'Často kladené dotazy',
-'File': 'Soubor',
-'file': 'soubor',
-'file "%(filename)s" created': 'file "%(filename)s" created',
-'file saved on %(time)s': 'soubor uložen %(time)s',
-'file saved on %s': 'soubor uložen %s',
-'Filename': 'Název souboru',
-'filter': 'filtr',
-'Find Next': 'Najít další',
-'Find Previous': 'Najít předchozí',
 'First name': 'Křestní jméno',
-'Forgot username?': 'Zapomněl jste svoje přihlašovací jméno?',
-'forgot username?': 'zapomněl jste svoje přihlašovací jméno?',
 'Forms and Validators': 'Formuláře a validátory',
-'Frames': 'Frames',
 'Free Applications': 'Aplikace zdarma',
-'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
-'Generate': 'Vytvořit',
-'Get from URL:': 'Stáhnout z internetu:',
-'Git Pull': 'Git Pull',
-'Git Push': 'Git Push',
-'Globals##debug': 'Globální proměnné',
-'go!': 'OK!',
-'Goto': 'Goto',
-'graph model': 'graph model',
+'Function disabled': 'Function disabled',
 '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',
 'Helping web2py': 'Helping web2py',
-'Hide/Show Translated strings': 'Skrýt/Zobrazit přeložené texty',
 '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': 'Kolikrát dosaženo',
 'Home': 'Domovská stránka',
-'honored only if the expression evaluates to true': 'brát v potaz jen když se tato podmínka vyhodnotí kladně',
 'How did you get here?': 'Jak jste se sem vlastně dostal?',
-'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
-'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'import': 'import',
 'Import/Export': 'Import/Export',
-'includes': 'zahrnuje',
-'Index': 'Index',
-'insert new': 'vložit nový záznam ',
-'insert new %s': 'vložit nový záznam %s',
-'inspect attributes': 'inspect attributes',
-'Install': 'Instalovat',
-'Installed applications': 'Nainstalované aplikace',
-'Interaction at %s line %s': 'Interakce v %s, na řádce %s',
-'Interactive console': 'Interaktivní příkazová řádka',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
+'Insufficient privileges': 'Insufficient privileges',
 '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',
-'Is Active': 'Je aktivní',
-'It is %s %%{day} today.': 'Dnes je to %s %%{den}.',
+'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': 'Klíč',
-'Key bindings': 'Vazby klíčů',
-'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
-'languages': 'jazyky',
-'Languages': 'Jazyky',
+'Key verified': 'Key verified',
 'Last name': 'Příjmení',
-'Last saved on:': 'Naposledy uloženo:',
 'Layout': 'Rozvržení stránky (layout)',
-'Layout Plugins': 'Moduly rozvržení stránky (Layout Plugins)',
-'Layouts': 'Rozvržení stránek',
-'License for': 'Licence pro',
-'Line number': 'Číslo řádku',
-'LineNo': 'Č.řádku',
 'Live Chat': 'Online pokec',
-'loading...': 'nahrávám...',
-'locals': 'locals',
-'Locals##debug': 'Lokální proměnné',
 '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 to the Administrative Interface': 'Přihlásit se do Správce aplikací',
-'logout': 'odhlásit se',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Logout': 'Odhlásit se',
 'Lost Password': 'Zapomněl jste heslo',
-'Lost password?': 'Zapomněl jste heslo?',
-'lost password?': 'zapomněl jste heslo?',
-'Manage': 'Manage',
+'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': 'Model rozbalovací nabídky',
-'Models': 'Modely',
-'models': 'modely',
-'Modified By': 'Změněno - kým',
-'Modified On': 'Změněno - kdy',
-'Modules': 'Moduly',
-'modules': 'moduly',
 'My Sites': 'Správa aplikací',
 'Name': 'Jméno',
-'new application "%s" created': 'nová aplikace "%s" vytvořena',
-'New application wizard': 'Nový průvodce aplikací',
-'New Application Wizard': 'Nový průvodce aplikací',
 'New password': 'Nové heslo',
 'New Record': 'Nový záznam',
 'new record inserted': 'nový záznam byl založen',
-'New simple application': 'Vytvořit primitivní aplikaci',
-'next': 'next',
 'next %s rows': 'next %s rows',
-'next 100 rows': 'dalších 100 řádků',
 'No databases in this application': 'V této aplikaci nejsou žádné databáze',
-'No Interaction yet': 'Ještě žádná interakce nenastala',
-'No ticket_storage.txt found under /private folder': 'Soubor ticket_storage.txt v adresáři /private nenalezen',
 'Number of entries: **%s**': 'Number of entries: **%s**',
 'Object or table name': 'Objekt či tabulka',
 'Old password': 'Původní heslo',
 'Online book': 'Online book',
-'online designer': 'online návrhář',
 'Online examples': 'Příklady online',
-'Open new app in new window': 'Open new app in new window',
-'or alternatively': 'or alternatively',
-'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'nebo importovat z .csv souboru',
 'Origin': 'Původ',
-'Original/Translation': 'Originál/Překlad',
-'Other Plugins': 'Ostatní moduly',
 'Other Recipes': 'Ostatní zásuvné moduly',
 'Overview': 'Přehled',
-'Overwrite installed app': 'Přepsat instalovanou aplikaci',
-'Pack all': 'Zabalit',
-'Pack compiled': 'Zabalit zkompilované',
-'pack plugin': 'pack plugin',
-'password': 'heslo',
 'Password': 'Heslo',
+'Password changed': 'Password changed',
 "Password fields don't match": 'Hesla se neshodují',
-'Peeking at file': 'Peeking at file',
+'Password reset': 'Password reset',
+'Password retrieve': 'Password retrieve',
 'Permission': 'Permission',
 'Permissions': 'Permissions',
-'Please': 'Prosím',
-'Plugin "%s" in application': 'Plugin "%s" in application',
-'plugins': 'zásuvné moduly',
+'please input your password again': 'please input your password again',
 'Plugins': 'Zásuvné moduly',
-'Plural Form #%s': 'Plural Form #%s',
-'Plural-Forms:': 'Množná čísla:',
 'Powered by': 'Poháněno',
 'Preface': 'Předmluva',
 'previous %s rows': 'previous %s rows',
-'previous 100 rows': 'předchozích 100 řádků',
-'Private files': 'Soukromé soubory',
-'private files': 'soukromé soubory',
-'profile': 'profil',
-'Project Progress': 'Vývoj projektu',
+'Profile': 'Profile',
+'Profile updated': 'Profile updated',
 'pygraphviz library not found': 'pygraphviz library not found',
 'Python': 'Python',
 'Query:': 'Dotaz:',
@@ -347,170 +177,90 @@
 'RAM Cache Keys': 'Klíče RAM Cache',
 'Ram Cleared': 'RAM smazána',
 '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': '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',
-'refresh': 'obnovte',
-'register': 'registrovat',
+'Record ID': 'ID záznamu',
+'Record Updated': 'Record Updated',
 'Register': 'Zaregistrovat se',
 'Registration identifier': 'Registrační identifikátor',
+'Registration is pending approval': 'Registration is pending approval',
 'Registration key': 'Registrační klíč',
-'reload': 'reload',
-'Reload routes': 'Znovu nahrát cesty',
+'Registration needs verification': 'Registration needs verification',
+'Registration successful': 'Registration successful',
 'Remember me (for 30 days)': 'Zapamatovat na 30 dní',
-'Remove compiled': 'Odstranit zkompilované',
-'Removed Breakpoint on %s at line %s': 'Bod přerušení smazán - soubor %s na řádce %s',
-'Replace': 'Zaměnit',
-'Replace All': 'Zaměnit vše',
-'request': 'request',
+'Request reset password': 'Request reset password',
 'Reset Password key': 'Reset registračního klíče',
-'response': 'response',
-'restart': 'restart',
-'restore': 'obnovit',
-'Retrieve username': 'Získat přihlašovací jméno',
-'return': 'return',
-'revert': 'vrátit se k původnímu',
 'Role': 'Role',
 'Roles': 'Roles',
 'Rows in Table': 'Záznamy v tabulce',
 'Rows selected': 'Záznamů zobrazeno',
-'rules are not defined': 'pravidla nejsou definována',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Spustí testy v tomto souboru (ke spuštění všech testů, použijte tlačítko 'test')",
-'Running on %s': 'Běží na %s',
-'Save': 'Uložit',
-'Save file:': 'Save file:',
 'Save model as...': 'Save model as...',
-'Save via Ajax': 'Uložit pomocí Ajaxu',
-'Saved file hash:': 'hash uloženého souboru:',
-'Semantic': 'Modul semantic',
 'Services': 'Služby',
-'session': 'session',
-'session expired': 'session expired',
-'Set Breakpoint on %s at line %s: %s': 'Bod přerušení nastaven v souboru %s na řádce %s: %s',
-'shell': 'příkazová řádka',
 'Sign Up': 'Sign Up',
-'Singular Form': 'Singular Form',
-'Site': 'Správa aplikací',
+'Sign up': 'Sign up',
 'Size of cache:': 'Velikost cache:',
-'skip to generate': 'skip to generate',
-'Sorry, could not find mercurial installed': 'Bohužel mercurial není nainstalován.',
-'Start a new app': 'Vytvořit novou aplikaci',
-'Start searching': 'Začít hledání',
-'Start wizard': 'Spustit průvodce',
 'state': 'stav',
-'Static': 'Static',
-'static': 'statické soubory',
-'Static files': 'Statické soubory',
 'Statistics': 'Statistika',
-'Step': 'Step',
-'step': 'step',
-'stop': 'stop',
 'Stylesheet': 'CSS styly',
 'submit': 'odeslat',
 'Submit': 'Odeslat',
-'successful': 'úspěšně',
 'Support': 'Podpora',
-'Sure you want to delete this object?': 'Opravdu chcete smazat tento objekt?',
 'Table': 'tabulka',
-'Table name': 'Název tabulky',
-'Temporary': 'Dočasný',
-'test': 'test',
-'Testing application': 'Testing application',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Dotaz" je podmínka, například "db.tabulka1.pole1==\'hodnota\'". Podmínka "db.tabulka1.pole1==db.tabulka2.pole2" pak vytvoří SQL JOIN.',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika aplikace: každá URL je mapována na funkci vystavovanou kontrolérem.',
 'The Core': 'Jádro (The Core)',
-'The data representation, define database tables and sets': 'Reprezentace dat: definovat tabulky databáze a záznamy',
 'The output of the file is a dictionary that was rendered by the view %s': 'Výstup ze souboru je slovník, který se zobrazil v pohledu %s.',
-'The presentations layer, views are also known as templates': 'Prezentační vrstva: pohledy či templaty (šablony)',
 'The Views': 'Pohledy (The Views)',
-'There are no controllers': 'There are no controllers',
-'There are no modules': 'There are no modules',
-'There are no plugins': 'Žádné moduly nejsou instalovány.',
-'There are no private files': 'Žádné soukromé soubory neexistují.',
-'There are no static files': 'There are no static files',
-'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
-'There are no views': 'There are no views',
-'These files are not served, they are only available from within your app': 'Tyto soubory jsou klientům nepřístupné. K dispozici jsou pouze v rámci aplikace.',
-'These files are served without processing, your images go here': 'Tyto soubory jsou servírovány bez přídavné logiky, sem patří např. obrázky.',
 'This App': 'Tato aplikace',
-'This is a copy of the scaffolding application': 'Toto je kopie aplikace skelet.',
-'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
-'This is the %(filename)s template': 'This is the %(filename)s template',
-'this page to see if a breakpoint was hit and debug interaction is required.': 'tuto stránku, abyste uviděli, zda se dosáhlo bodu přerušení.',
-'Ticket': 'Ticket',
-'Ticket ID': 'Ticket ID',
+'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)': 'Čas v Cache (h:m:s)',
 'Timestamp': 'Časové razítko',
-'to  previous version.': 'k předchozí verzi.',
-'To create a plugin, name a file/folder plugin_[name]': 'Zásuvný modul vytvoříte tak, že pojmenujete soubor/adresář plugin_[jméno modulu]',
-'To emulate a breakpoint programatically, write:': 'K nastavení bodu přerušení v kódu programu, napište:',
-'to use the debugger!': ', abyste mohli ladící program používat!',
-'toggle breakpoint': 'vyp./zap. bod přerušení',
-'Toggle Fullscreen': 'Na celou obrazovku a zpět',
-'too short': 'Příliš krátké',
 'Traceback': 'Traceback',
-'Translation strings for the application': 'Překlad textů pro aplikaci',
-'try something like': 'try something like',
-'Try the mobile interface': 'Zkuste rozhraní pro mobilní zařízení',
-'try view': 'try view',
 'Twitter': 'Twitter',
-'Type python statement in here and hit Return (Enter) to execute it.': 'Type python statement in here and hit Return (Enter) to execute it.',
-'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
-'Unable to check for upgrades': 'Unable to check for upgrades',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'unable to parse csv file': 'csv soubor nedá sa zpracovat',
-'uncheck all': 'vše odznačit',
-'Uninstall': 'Odinstalovat',
-'update': 'aktualizovat',
-'update all languages': 'aktualizovat všechny jazyky',
+'Unable to send email': 'Unable to send email',
 'Update:': 'Upravit:',
-'Upgrade': 'Upgrade',
-'upgrade now': 'upgrade now',
-'upgrade now to %s': 'upgrade now to %s',
-'upload': 'nahrát',
-'Upload': 'Upload',
-'Upload a package:': 'Nahrát balík:',
-'Upload and install packed application': 'Nahrát a instalovat zabalenou aplikaci',
-'upload file:': 'nahrát soubor:',
-'upload plugin file:': 'nahrát soubor modulu:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Použijte (...)&(...) pro AND, (...)|(...) pro OR a ~(...) pro NOT pro sestavení složitějších dotazů.',
 'User': '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',
-'Version': 'Verze',
-'Version %s.%s.%s (%s) %s': 'Verze %s.%s.%s (%s) %s',
-'Versioning': 'Verzování',
 'Videos': 'Videa',
 'View': 'Pohled (View)',
-'Views': 'Pohledy',
-'views': 'pohledy',
-'Web Framework': 'Web Framework',
-'web2py is up to date': 'Máte aktuální verzi web2py.',
-'web2py online debugger': 'Ladící online web2py program',
-'web2py Recent Tweets': 'Štěbetání na Twitteru o web2py',
-'web2py upgrade': 'web2py upgrade',
-'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
-'Welcome': 'Vítejte',
-'Welcome to web2py': 'Vitejte ve web2py',
+'Welcome %(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!': '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 need to set up and reach a': 'Je třeba nejprve nastavit a dojít až na',
+'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': '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,34 +3,40 @@
 '!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',
 '(**%.0d MB**)': '(**%.0d MB**)',
-'**%(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** %%{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)': '**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',
+'@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)': '``**nicht verfügbar**``:rot (benötigt die Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] Bibliothek)',
+'A new password was emailed to you': 'A new password was emailed to you',
 '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',
+'API Example': 'API Example',
 'appadmin is disabled because insecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
+'Apply changes': 'Aplicar canvis',
 'Are you sure you want to delete this object?': 'Sind Sie sich sicher, dass Sie dieses Objekt löschen wollen?',
+'Authentication code': 'Authentication code',
 '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',
@@ -38,22 +44,22 @@
 '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',
 'Cannot be empty': 'Darf nicht leer sein',
+'Change Password': 'Canviï la Contrasenya',
+'Change password': 'Canviï la contrasenya',
 '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',
+'Click on the link %(link)s to reset your password': "Cliqui en l'enllaç %(link)s per a reiniciar la seva contrasenya",
+'Client IP': 'IP del Client',
 '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!',
 'data uploaded': 'Datei hochgeladen',
 'Database': 'Datenbank',
 'Database %s select': 'Datenbank %s ausgewählt',
@@ -63,126 +69,149 @@
 'Delete:': 'Lösche:',
 'Demo': 'Demo',
 'Deployment Recipes': 'Entwicklungsrezepte',
-'Description': 'Beschreibung',
+'Description': 'Descripció',
 'design': 'Design',
 'Design': 'Design',
 'DISK': 'DISK',
-'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cache Keys': 'Festplatten-Cache-Schlüssel',
 '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',
+'E-mail': 'Correu electrònic',
 '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',
+'Email sent': 'Correu electrònic enviat',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Errors': 'Fehlermeldungen',
 'export as csv file': 'als csv Datei exportieren',
 'FAQ': 'FAQ',
-'First name': 'Vorname',
+'First name': 'Nom',
 'Forms and Validators': 'Forms und Validators',
 'Free Applications': 'Kostenlose Anwendungen',
+'Function disabled': 'Function disabled',
 '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',
+'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': 'Gruppen',
 'Hello World': 'Hallo Welt',
-'Hello World  ## Kommentar': 'Hallo Welt  ',
-'Hello World## Kommentar': 'Hallo Welt',
-'Helping web2py': 'Helping web2py',
+'Helping web2py': 'web 2py helfen',
 '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',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
+'Insufficient privileges': 'Privilegis insuficients',
 'Internal State': 'Innerer Zustand',
 'Introduction': 'Einführung',
-'Invalid email': 'Ungültige Email',
+'Invalid email': 'Correo electrónico invàlid',
+'Invalid key': 'Invalid key',
+'Invalid login': 'Inici de sessió invàlida',
+'Invalid password': 'Invalid password',
 'Invalid Query': 'Ungültige Query',
 'invalid request': 'Ungültiger Request',
-'Is Active': 'Ist aktiv',
+'Invalid reset password': 'Reinici de contrasenya invàlid',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Schlüssel',
-'Last name': 'Nachname',
+'Key verified': 'Key verified',
+'Last name': 'Cognom',
 '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',
+'Logged in': 'Sessió iniciada',
+'Logged out': 'Sessió finalitzada',
+'Login': 'Inici de sessió',
+'Login disabled by administrator': 'Inici de sessió inhabilitat pel administrador',
+'Logout': 'Fi de sessió',
 'Lost Password': 'Passwort vergessen',
-'Lost password?': 'Passwort vergessen?',
+'Lost your password?': 'Lost your password?',
 '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',
+'Name': 'Nombre',
+'New password': 'Contrasenya nova',
 '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',
+'Object or table name': 'Nom del objecte o taula',
+'Old password': 'Contrasenya anterior',
 'Online book': 'Online Buch',
 'Online examples': 'Online Beispiele',
 'or import from csv file': 'oder von csv Datei importieren',
-'Origin': 'Ursprung',
-'Other Plugins': 'Andere Plugins',
+'Origin': 'Origen',
 'Other Recipes': 'Andere Rezepte',
 'Overview': 'Überblick',
-'Password': 'Passwort',
-"Password fields don't match": 'Passwortfelder sind nicht gleich',
+'Password': 'Contrasenya',
+'Password changed': 'Contrasenya cambiada',
+"Password fields don't match": 'Els camps de contrasenya no coincideixen',
+'Password reset': 'Reinici de contrasenya',
+'Password retrieve': 'Password retrieve',
 'Permission': 'Erlaubnis',
 'Permissions': 'Erlaubnisse',
-'please input your password again': 'Bitte geben Sie ihr Passwort erneut ein',
+'please input your password again': 'si us plau, entri un altre cop la seva contrasenya',
 'Plugins': 'Plugins',
 'Powered by': 'Unterstützt von',
 'Preface': 'Allgemeines',
 'previous %s rows': 'vorherige %s Reihen',
-'Profile': 'Profil',
+'Profile': 'Perfil',
+'Profile updated': 'Perfil actualitzat',
 '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.',
 'Recipes': 'Rezepte',
 'Record': 'Eintrag',
+'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': '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',
+'Record ID': 'ID de Registre',
+'Record Updated': 'Record Updated',
+'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',
+'Remember me (for 30 days)': "Recordi'm (durant 30 dies)",
+'Request reset password': 'Sol·licitud de restabliment de contrasenya',
+'Reset Password key': 'Restaurar Clau de la Contrasenya',
 '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',
+'Sign up': 'Sign up',
 'Size of cache:': 'Cachegröße:',
 'state': 'Status',
 'Statistics': 'Statistik',
 'Stylesheet': 'Stylesheet',
 'submit': 'Submit',
+'Submit': 'Enviar',
 '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.',
@@ -190,29 +219,48 @@
 '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',
 'This App': 'Diese App',
-'This email already has an account': 'Diese email besitzt bereits ein Konto',
+'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',
 'Time in Cache (h:m:s)': 'Zeit im Cache (h:m:s)',
-'Timestamp': 'Zeitstempel',
+'Timestamp': 'Marca de temps',
 'Traceback': 'Zurückverfolgen',
 'Twitter': 'Twitter',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'unable to parse csv file': 'csv Datei konnte nicht geparst werden',
+'Unable to send email': 'Unable to send email',
 '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',
+'User %(id)s is impersonating %(other_id)s': 'El usuari %(id)s està suplantant %(other_id)s',
+'User %(id)s Logged-in': 'El usuari %(id)s inicià la sessió',
+'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 ID': 'ID de Usuari',
+'Username': 'Nom de usuari',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Recuperar nom de usuari',
 'Users': 'Benutzer',
-'value already in database or empty': 'Wert ist bereits in der Datenbank oder leer',
-'Verify Password': 'Passwort überprüfen',
+'Verify Password': 'Verificar Contrasenya',
 'Videos': 'Videos',
 'View': 'Ansicht',
-'Welcome': 'Willkommen',
+'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!': 'Willkommen bei web2py!',
 'Which called the function %s located in the file %s': 'Welche die Funktion %s in der Datei %s aufrief',
+'Wiki Example': 'Wiki Example',
 '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 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': 'Sie haben die URL %s besucht',
+'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/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

@@ -3,137 +3,75 @@
 '!langcode!': 'es',
 '!langname!': 'Español',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"actualice" es una expresión opcional como "campo1=\'nuevo_valor\'". No se puede actualizar o eliminar resultados de un JOIN',
-'%(nrows)s records found': '%(nrows)s registros encontrados',
-'%s %%{position}': '%s %%{posición}',
 '%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 %H:%M:%S': '%d/%m/%A %H:%M:%S',
+'%Y-%m-%d': '%d/%m/%Y',
+'%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 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',
+'A new password was emailed to you': 'A new password was emailed to you',
 'About': 'Acerca de',
-'about': 'acerca de',
-'About application': 'Acerca de la aplicación',
 'Access Control': 'Control de Acceso',
-'Add': 'Añadir',
-'additional code for your application': 'código adicional para su aplicación',
 'admin': 'administrar',
-'admin disabled because no admin password': 'admin deshabilitado por falta de contraseña',
-'admin disabled because not supported on google app engine': 'admin deshabilitado, no es soportado en GAE',
-'admin disabled because unable to access password file': 'admin deshabilitado, imposible acceder al archivo con la contraseña',
-'Admin is disabled because insecure channel': 'Admin deshabilitado, el canal no es seguro',
-'Admin is disabled because unsecure channel': 'Admin deshabilitado, el canal no es seguro',
-'Administrative interface': 'Interfaz administrativa',
-'Administrative Interface': 'Interfaz Administrativa',
-'Administrator Password:': 'Contraseña del Administrador:',
 'Ajax Recipes': 'Recetas AJAX',
-'An error occured, please %s the page': 'Ha ocurrido un error, por favor %s la página',
 'An error occured, please [[reload %s]] the page': 'Ha ocurrido un error, por favor [[reload %s]] la pagina',
-'And': 'Y',
-'and rename it (required):': 'y renómbrela (requerido):',
-'and rename it:': ' y renómbrelo:',
-'appadmin': 'appadmin',
+'API Example': 'API Example',
 'appadmin is disabled because insecure channel': 'appadmin deshabilitado, el canal no es seguro',
-'application "%s" uninstalled': 'aplicación "%s" desinstalada',
-'application compiled': 'aplicación compilada',
-'application is compiled and cannot be designed': 'la aplicación está compilada y no puede ser modificada',
 'Apply changes': 'Aplicar cambios',
-'Appointment': 'Nombramiento',
-'Are you sure you want to delete file "%s"?': '¿Está seguro que desea eliminar el archivo "%s"?',
 'Are you sure you want to delete this object?': '¿Está seguro que desea borrar este objeto?',
-'Are you sure you want to uninstall application "%s"': '¿Está seguro que desea desinstalar la aplicación "%s"',
-'Are you sure you want to uninstall application "%s"?': '¿Está seguro que desea desinstalar la aplicación "%s"?',
-'at': 'en',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENCION: Inicio de sesión requiere una conexión segura (HTTPS) o corriendo en localhost.',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENCION: NO EJECUTE VARIAS PRUEBAS SIMULTANEAMENTE, NO SON THREAD SAFE.',
-'ATTENTION: you cannot edit the running application!': 'ATENCION: no puede modificar la aplicación que está ejecutandose!',
-'Authentication': 'Autenticación',
-'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!',
+'Authentication code': 'Authentication code',
 'Available Databases and Tables': 'Bases de datos y tablas disponibles',
-'Back': 'Atrás',
-'Buy this book': 'Compra este libro',
 "Buy web2py's book": 'Compra el libro de web2py',
-'Cache': 'Caché',
 'cache': 'caché',
+'Cache': 'Caché',
 'Cache Cleared': 'Cache Limpiada',
 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'La Cache contiene items con **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} de antiguedad.',
 'Cache Keys': 'Llaves de la Caché',
-'cache, errors and sessions cleaned': 'caché, errores y sesiones eliminados',
 'Cannot be empty': 'No puede estar vacío',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'No se puede compilar: hay errores en su aplicación. Depure, corrija errores y vuelva a intentarlo.',
-'cannot create file': 'no es posible crear archivo',
-'cannot upload file "%(filename)s"': 'no es posible subir archivo "%(filename)s"',
 'Change Password': 'Cambie la Contraseña',
 'Change password': 'Cambie la contraseña',
-'change password': 'cambie la contraseña',
-'check all': 'marcar todos',
 'Check to delete': 'Marque para eliminar',
-'choose one': 'escoja uno',
-'clean': 'limpiar',
-'Clear': 'Limpiar',
 'Clear CACHE?': '¿Limpiar CACHÉ?',
 'Clear DISK': 'Limpiar DISCO',
 'Clear RAM': 'Limpiar RAM',
 'Click on the link %(link)s to reset your password': 'Pulse en el enlace %(link)s para reiniciar su contraseña',
-'click to check for upgrades': 'haga clic para buscar actualizaciones',
-'client': 'cliente',
 'Client IP': 'IP del Cliente',
-'Close': 'Cerrar',
 'Community': 'Comunidad',
-'compile': 'compilar',
-'compiled application removed': 'aplicación compilada eliminada',
 'Components and Plugins': 'Componentes y Plugins',
 'Config.ini': 'Config.ini',
-'contains': 'contiene',
 'Controller': 'Controlador',
-'Controllers': 'Controladores',
-'controllers': 'controladores',
 'Copyright': 'Copyright',
-'create file with filename:': 'cree archivo con nombre:',
-'Create new application': 'Cree una nueva aplicación',
-'create new application:': 'cree una nueva aplicación:',
-'Created By': 'Creado Por',
-'Created On': 'Creado En',
-'CSV (hidden cols)': 'CSV (columnas ocultas)',
 'Current request': 'Solicitud en curso',
 'Current response': 'Respuesta en curso',
 'Current session': 'Sesión en curso',
-'currently saved or': 'actualmente guardado o',
-'customize me!': '¡Personalizame!',
 'data uploaded': 'datos subidos',
 'Database': 'Base de datos',
 'Database %s select': 'selección en base de datos %s',
-'database administration': 'administración de base de datos',
 'Database Administration (appadmin)': 'Administración de Base de Datos (appadmin)',
-'Date and Time': 'Fecha y Hora',
-'DB': 'BDD',
 'db': 'bdd',
 'DB Model': 'Modelo BDD',
-'defines tables': 'define tablas',
-'Delete': 'Eliminar',
-'delete': 'eliminar',
-'delete all checked': 'eliminar marcados',
 'Delete:': 'Eliminar:',
 'Demo': 'Demostración',
-'Deploy on Google App Engine': 'Despliegue en Google App Engine',
 'Deployment Recipes': 'Recetas de despliegue',
 'Description': 'Descripción',
 'design': 'diseño',
-'DESIGN': 'DISEÑO',
 'Design': 'Diseño',
-'Design for': 'Diseño por',
-'detecting': 'detectando',
 'DISK': 'DISCO',
 'Disk Cache Keys': 'Llaves de Caché en Disco',
 'Disk Cleared': 'Disco limpiado',
@@ -143,173 +81,96 @@
 'done!': '¡hecho!',
 'Download': 'Descargas',
 'E-mail': 'Correo electrónico',
-'edit': 'editar',
-'EDIT': 'EDITAR',
-'Edit': 'Editar',
-'Edit application': 'Editar aplicación',
-'edit controller': 'editar controlador',
 'Edit current record': 'Edite el registro actual',
-'Edit Profile': 'Editar Perfil',
-'edit profile': 'editar perfil',
-'Edit This App': 'Edite esta App',
-'Editing file': 'Editando archivo',
-'Editing file "%s"': 'Editando archivo "%s"',
 'Email and SMS': 'Correo electrónico y SMS',
 'Email sent': 'Correo electrónico enviado',
-'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',
-'enter an integer between %(min)g and %(max)g': 'introduzca un número entero entre %(min)g y %(max)g',
-'enter date and time as %(format)s': 'introduzca fecha y hora como %(format)s',
-'Error logs for "%(app)s"': 'Bitácora de errores para "%(app)s"',
-'errors': 'errores',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Errors': 'Errores',
-'Errors in form, please check it out.': 'Hay errores en el formulario, por favor compruébelo.',
 'export as csv file': 'exportar como archivo CSV',
-'Export:': 'Exportar:',
-'exposes': 'expone',
-'extends': 'extiende',
-'failed to reload module': 'la recarga del módulo ha fallado',
 'FAQ': 'Preguntas frecuentes',
-'file "%(filename)s" created': 'archivo "%(filename)s" creado',
-'file "%(filename)s" deleted': 'archivo "%(filename)s" eliminado',
-'file "%(filename)s" uploaded': 'archivo "%(filename)s" subido',
-'file "%(filename)s" was not deleted': 'archivo "%(filename)s" no fué eliminado',
-'file "%s" of %s restored': 'archivo "%s" de %s restaurado',
-'file changed on disk': 'archivo modificado en el disco',
-'file does not exist': 'archivo no existe',
-'file saved on %(time)s': 'archivo guardado %(time)s',
-'file saved on %s': 'archivo guardado %s',
 'First name': 'Nombre',
-'Forgot username?': '¿Olvidó el nombre de usuario?',
 'Forms and Validators': 'Formularios y validadores',
 'Free Applications': 'Aplicaciones Libres',
-'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
+'Function disabled': 'Function disabled',
 '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',
 'Hello World': 'Hola Mundo',
-'help': 'ayuda',
 'Helping web2py': 'Ayudando a 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': 'Inicio',
 'How did you get here?': '¿Cómo llegaste aquí?',
-'htmledit': 'htmledit',
-'Impersonate': 'Suplantar',
 'import': 'importar',
 'Import/Export': 'Importar/Exportar',
-'in': 'en',
-'includes': 'incluye',
-'Index': 'Índice',
-'insert new': 'inserte nuevo',
-'insert new %s': 'inserte nuevo %s',
-'Installed applications': 'Aplicaciones instaladas',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Insufficient privileges': 'Privilegios insuficientes',
-'internal error': 'error interno',
 'Internal State': 'Estado Interno',
 'Introduction': 'Introducción',
-'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',
-'Is Active': 'Está Activo',
+'Invalid user': 'Invalid user',
+'Invalid username': 'Invalid username',
+'Invitation to join %(site)s': 'Invitation to join %(site)s',
 'Key': 'Llave',
-'language file "%(filename)s" created/updated': 'archivo de lenguaje "%(filename)s" creado/actualizado',
-'Language files (static strings) updated': 'Archivos de lenguaje (cadenas estáticas) actualizados',
-'languages': 'lenguajes',
-'Languages': 'Lenguajes',
-'languages updated': 'lenguajes actualizados',
+'Key verified': 'Key verified',
 'Last name': 'Apellido',
-'Last saved on:': 'Guardado en:',
 'Layout': 'Diseño de página',
-'Layout Plugins': 'Plugins de diseño',
-'Layouts': 'Diseños de páginas',
-'License for': 'Licencia para',
 'Live Chat': 'Chat en vivo',
-'loading...': 'cargando...',
 'Log In': 'Iniciar sesion',
 'Logged in': 'Sesión iniciada',
 'Logged out': 'Sesión finalizada',
 'Login': 'Inicio de sesión',
-'login': 'inicio de sesión',
 'Login disabled by administrator': 'Inicio de sesión deshabilitado por el administrador',
-'Login to the Administrative Interface': 'Inicio de sesión para la Interfaz Administrativa',
-'logout': 'fin de sesión',
 'Logout': 'Fin de sesión',
 'Lost Password': 'Contraseña perdida',
-'Lost password?': '¿Olvidó la contraseña?',
-'lost password?': '¿olvidó la contraseña?',
-'Main Menu': 'Menú principal',
+'Lost your password?': 'Lost your password?',
 'Manage %(action)s': 'Gestionar %(action)s',
 'Manage Access Control': 'Gestionar control de acceso',
 'Manage Cache': 'Gestionar la Caché',
 'Memberships': 'Membresias',
 'Menu Model': 'Modelo "menu"',
-'merge': 'Combinar',
-'Models': 'Modelos',
-'models': 'modelos',
-'Modified By': 'Modificado Por',
-'Modified On': 'Modificado En',
-'Modules': 'Módulos',
-'modules': 'módulos',
-'must be YYYY-MM-DD HH:MM:SS!': '¡debe ser DD/MM/YYYY HH:MM:SS!',
-'must be YYYY-MM-DD!': '¡debe ser DD/MM/YYYY!',
 'My Sites': 'Mis Sitios',
 'Name': 'Nombre',
-'New': 'Nuevo',
-'New %(entity)s': 'Nuevo %(entity)s',
-'new application "%s" created': 'nueva aplicación "%s" creada',
 'New password': 'Contraseña nueva',
 'New Record': 'Registro nuevo',
 'new record inserted': 'nuevo registro insertado',
 'next %s rows': 'siguiente %s filas',
-'next 100 rows': '100 filas siguientes',
-'NO': 'NO',
 'No databases in this application': 'No hay bases de datos en esta aplicación',
-'No records found': 'No se han encontrado registros',
-'Not authorized': 'No autorizado',
-'not in': 'no en',
 'Number of entries: **%s**': 'Numero de entradas: **%s**',
 'Object or table name': 'Nombre del objeto o tabla',
 'Old password': 'Contraseña vieja',
 'Online book': 'Libro Online',
 'Online examples': 'Ejemplos en línea',
-'Or': 'O',
 'or import from csv file': 'o importar desde archivo CSV',
-'or provide application url:': 'o provea URL de la aplicación:',
 'Origin': 'Origen',
-'Original/Translation': 'Original/Traducción',
-'Other Plugins': 'Otros Plugins',
 'Other Recipes': 'Otras Recetas',
 'Overview': 'Resumen',
-'pack all': 'empaquetar todo',
-'pack compiled': 'empaquetar compilados',
 'Password': 'Contraseña',
 'Password changed': 'Contraseña cambiada',
 "Password fields don't match": 'Los campos de contraseña no coinciden',
 'Password reset': 'Reinicio de contraseña',
-'Peeking at file': 'Visualizando archivo',
+'Password retrieve': 'Password retrieve',
 'Permission': 'Permiso',
 'Permissions': 'Permisos',
-'Phone': 'Teléfono',
 'please input your password again': 'por favor introduzca su contraseña otra vez',
 'Plugins': 'Plugins',
 'Powered by': 'Este sitio usa',
 'Preface': 'Prefacio',
 'previous %s rows': 'fila %s anterior',
-'previous 100 rows': '100 filas anteriores',
 'Profile': 'Perfil',
 'Profile updated': 'Perfil actualizado',
 'pygraphviz library not found': 'Libreria pygraphviz no encontrada',
 'Python': 'Python',
-'Query Not Supported: %s': 'Consulta No Soportada: %s',
 'Query:': 'Consulta:',
 'Quick Examples': 'Ejemplos Rápidos',
 'RAM': 'RAM',
@@ -319,108 +180,55 @@
 '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',
-'register': 'regístrese',
+'Record ID': 'ID de Registro',
+'Record Updated': 'Record Updated',
 '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)',
-'remove compiled': 'eliminar compiladas',
 'Request reset password': 'Solicitar reinicio de contraseña',
-'Reset password': 'Reiniciar contraseña',
 'Reset Password key': 'Restaurar Llave de la Contraseña',
-'Resolve Conflict file': 'archivo Resolución de Conflicto',
-'restore': 'restaurar',
-'Retrieve username': 'Recuperar nombre de usuario',
-'revert': 'revertir',
 'Role': 'Rol',
 'Roles': 'Roles',
 'Rows in Table': 'Filas en la tabla',
 'Rows selected': 'Filas seleccionadas',
-'save': 'guardar',
 'Save model as...': 'Guardar modelo como...',
-'Saved file hash:': 'Hash del archivo guardado:',
-'Search': 'Buscar',
-'Semantic': 'Semántica',
 'Services': 'Servicios',
-'session expired': 'sesión expirada',
-'shell': 'terminal',
 'Sign Up': 'Registrarse',
-'site': 'sitio',
+'Sign up': 'Sign up',
 'Size of cache:': 'Tamaño de la Caché:',
-'some files could not be removed': 'algunos archivos no pudieron ser removidos',
-'start': 'inicio',
-'starts with': 'comienza por',
 'state': 'estado',
-'static': 'estático',
-'Static files': 'Archivos estáticos',
 'Statistics': 'Estadísticas',
 'Stylesheet': 'Hoja de estilo',
-'Submit': 'Enviar',
 'submit': 'enviar',
-'Success!': '¡Correcto!',
+'Submit': 'Enviar',
 'Support': 'Soporte',
-'Sure you want to delete this object?': '¿Está seguro que desea eliminar este objeto?',
 'Table': 'tabla',
-'Table name': 'Nombre de la tabla',
-'test': 'probar',
-'Testing application': 'Probando aplicación',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La "consulta" es una condición como "db.tabla1.campo1==\'valor\'". Algo como "db.tabla1.campo1==db.tabla2.campo2" resulta en un JOIN SQL.',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'la lógica de la aplicación, cada ruta URL se mapea en una función expuesta en el controlador',
 'The Core': 'El Núcleo',
-'the data representation, define database tables and sets': 'la representación de datos, define tablas y conjuntos de base de datos',
 'The output of the file is a dictionary that was rendered by the view %s': 'La salida de dicha función es un diccionario que es desplegado por la vista %s',
-'the presentations layer, views are also known as templates': 'la capa de presentación, las vistas también son llamadas plantillas',
 'The Views': 'Las Vistas',
-'There are no controllers': 'No hay controladores',
-'There are no models': 'No hay modelos',
-'There are no modules': 'No hay módulos',
-'There are no static files': 'No hay archivos estáticos',
-'There are no translators, only default language is supported': 'No hay traductores, sólo el lenguaje por defecto es soportado',
-'There are no views': 'No hay vistas',
-'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',
-'Ticket': 'Tiquete',
 'Time in Cache (h:m:s)': 'Tiempo en Caché (h:m:s)',
 'Timestamp': 'Marca de tiempo',
-'to  previous version.': 'a la versión previa.',
-'To emulate a breakpoint programatically, write:': 'Emular un punto de ruptura programáticamente, escribir:',
-'to use the debugger!': '¡usar el depurador!',
-'toggle breakpoint': 'alternar punto de ruptura',
-'Toggle comment': 'Alternar comentario',
-'Toggle Fullscreen': 'Alternar pantalla completa',
-'too short': 'demasiado corto',
 'Traceback': 'Rastrear',
-'translation strings for the application': 'cadenas de caracteres de traducción para la aplicación',
-'try': 'intente',
-'try something like': 'intente algo como',
-'TSV (Excel compatible)': 'TSV (compatible con Excel)',
-'TSV (Excel compatible, hidden cols)': 'TSV (compatible con Excel, columnas ocultas)',
 'Twitter': 'Twitter',
-'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',
+'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
 'unable to parse csv file': 'no es posible analizar el archivo CSV',
-'unable to uninstall "%s"': 'no es posible instalar "%s"',
-'uncheck all': 'desmarcar todos',
-'uninstall': 'desinstalar',
-'unknown': 'desconocido',
-'update': 'actualizar',
-'update all languages': 'actualizar todos los lenguajes',
+'Unable to send email': 'Unable to send email',
 'Update:': 'Actualice:',
-'upload application:': 'subir aplicación:',
-'Upload existing application': 'Suba esta aplicación',
-'upload file:': 'suba archivo:',
 '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': 'Usuario',
 'User %(id)s is impersonating %(other_id)s': 'El usuario %(id)s está suplantando %(other_id)s',
@@ -428,41 +236,31 @@
 '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 %(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",
-'User Id': 'Id de Usuario',
+'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',
-'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',
-'value not allowed': 'valor no permitido',
-'value not in database': 'el valor no está en la base de datos',
 'Verify Password': 'Verificar Contraseña',
-'Version': 'Versión',
-'versioning': 'versionado',
 'Videos': 'Vídeos',
 'View': 'Vista',
-'view': 'vista',
-'View %(entity)s': 'Ver %(entity)s',
-'Views': 'Vistas',
-'views': 'vistas',
-'web2py is up to date': 'web2py está actualizado',
-'web2py Recent Tweets': 'Tweets Recientes de web2py',
-'Welcome': 'Bienvenido',
-'Welcome %s': 'Bienvenido %s',
-'Welcome to web2py': 'Bienvenido a 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 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} updated': '%s rangées mises à jour',
+'%s %%{row} deleted': '%s lignes supprimées',
+'%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,20 +13,30 @@
 '**%(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)',
-'about': 'à propos',
+'A new password was emailed to you': 'A new password was emailed to you',
 'About': 'À propos',
 'Access Control': "Contrôle d'accès",
 'admin': 'admin',
-'Administrative Interface': 'Administrative Interface',
-'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",
 'cache': 'cache',
 'Cache': 'Cache',
@@ -34,199 +44,223 @@
 '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': '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 DISK': 'Clear DISK',
-'Clear RAM': 'Clear RAM',
+'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': 'Components and Plugins',
+'Components and Plugins': 'Composants et Plugiciels',
 'Config.ini': 'Config.ini',
 'Controller': 'Contrôleur',
 'Copyright': "Droit d'auteur",
 '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 ',
-'Description': 'Descriptif',
+'Deployment Recipes': 'Recettes de déploiement',
+'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',
-'Edit': 'Éditer',
 'Edit current record': "Modifier l'enregistrement courant",
-'edit profile': 'modifier le profil',
-'Edit This App': 'Modifier cette application',
-'Email and SMS': 'Email and SMS',
-'enter an integer between %(min)g and %(max)g': 'entrer un entier compris entre %(min)g et %(max)g',
+'Email and SMS': 'Courriel et texto',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 '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',
-'Index': 'Index',
-'insert new': 'insérer un nouveau',
-'insert new %s': 'insérer un nouveau %s',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
+'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',
+'Key': 'Clé',
+'Key verified': 'Key verified',
 'Last name': 'Nom',
 'Layout': 'Mise en page',
-'Layout Plugins': 'Layout Plugins',
-'Layouts': 'layouts',
-'Live chat': 'Clavardage en direct',
-'Live Chat': 'Live Chat',
-'Log In': 'Log In',
+'Live Chat': 'Clavardage en direct',
+'Log In': 'Connexion',
 'Logged in': 'Connecté',
-'login': 'connectez-vous',
-'Login': 'Connectez-vous',
-'logout': 'déconnectez-vous',
-'lost password': 'mot de passe perdu',
+'Logged out': 'Logged out',
+'Login': 'Connexion',
+'Login disabled by administrator': 'Login disabled by administrator',
+'Logout': 'Logout',
 'Lost Password': 'Mot de passe perdu',
-'lost password?': 'mot de passe perdu?',
-'Main Menu': 'Menu principal',
+'Lost your password?': 'Lost your password?',
 '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',
+'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 100 rows': '100 prochaines lignes',
+'next %s rows': '%s prochaine 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 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 100 rows': '100 lignes précédentes',
-'profile': 'profile',
-'pygraphviz library not found': 'pygraphviz library not found',
+'previous %s rows': '%s lignes précédentes',
+'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 updated': 'Record %(id)s updated',
-'Record Created': 'Record Created',
+'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 d'enregistrement",
-'Record Updated': 'Record Updated',
+'Record id': "id de l'enregistrement",
+'Record ID': "ID de l'enregistrement",
+'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...',
-'Semantic': 'Sémantique',
+'Save model as...': 'Enregistrer le modèle sous...',
 'Services': 'Services',
-'Sign Up': 'Sign Up',
-'Size of cache:': 'Size of cache:',
+'Sign Up': "S'inscrire",
+'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?',
 'Table': 'tableau',
-'Table name': 'Nom du tableau',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La "query" est une condition comme "db.table1.champ1==\'valeur\'". Quelque chose comme "db.table1.champ1==db.table2.champ2" résulte en un JOIN SQL.',
 'The Core': 'Le noyau',
 '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 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)',
+'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)': '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.',
-'User': 'User',
+'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': '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',
-'Users': 'Users',
-'value already in database or empty': 'valeur déjà dans la base ou vide',
+'Username': 'Username',
+'Username already taken': 'Username already taken',
+'Username retrieve': 'Username retrieve',
+'Users': 'Utilisateurs',
 'Verify Password': 'Vérifiez le mot de passe',
 'Videos': 'Vidéos',
-'View': 'Présentation',
-'Web2py': 'Web2py',
-'Welcome': 'Bienvenu',
-'Welcome %s': 'Bienvenue %s',
-'Welcome to web2py': 'Bienvenue à web2py',
-'Welcome to web2py!': 'Welcome to web2py!',
+'View': 'Vue',
+'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!': '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...',
-'You are successfully running web2py': 'Vous roulez avec succès web2py',
+'Wiki Example': 'Wiki Example',
+'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,50 +13,59 @@
 '**%(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',
 'Access Control': "Contrôle d'accès",
 'admin': 'admin',
-'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",
 'cache': 'cache',
 'Cache': 'Cache',
 'Cache Cleared': 'Cache Cleared',
 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
-'Cache Keys': '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',
-'Created By': 'Créé par',
-'Created On': 'Créé le',
+'Copyright': "Droit d'auteur",
 '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 selectionnée',
 'Database Administration (appadmin)': 'Database Administration (appadmin)',
-'db': 'bdd',
-'DB Model': 'Modèle BDD',
+'db': 'db',
+'DB Model': 'Modèle BD',
 'Delete:': 'Supprimer:',
 'Demo': 'Démo',
 'Deployment Recipes': 'Recettes de déploiement',
@@ -71,13 +80,12 @@
 "Don't know what to do?": 'Vous ne savez pas quoi faire?',
 'done!': 'fait!',
 'Download': 'Téléchargement',
-'E-mail': 'E-mail',
-'Edit': 'Éditer',
+'E-mail': 'Courriel',
 'Edit current record': "Modifier l'enregistrement courant",
-'edit profile': 'modifier le profil',
-'Edit This App': 'Modifier cette application',
-'Email and SMS': 'Email et SMS',
-'enter an integer between %(min)g and %(max)g': 'entrez un entier entre %(min)g et %(max)g',
+'Email and SMS': 'Courriel et texto',
+'Email sent': 'Email sent',
+'Email verification': 'Email verification',
+'Email verified': 'Email verified',
 'Errors': 'Erreurs',
 'export as csv file': 'exporter sous forme de fichier csv',
 'FAQ': 'FAQ',
@@ -85,143 +93,174 @@
 'Forms and Validators': 'Formulaires et Validateurs',
 'Free Applications': 'Applications gratuites',
 'Function disabled': 'Fonction désactivée',
-'Graph Model': 'Graph Model',
-'Group ID': 'Groupe ID',
+'Graph Model': 'Représentation graphique du modèle',
+'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?',
-'import': 'Importer',
+'How did you get here?': 'How did you get here?',
+'import': 'importer',
 'Import/Export': 'Importer/Exporter',
-'Index': 'Index',
-'insert new': 'insérer un nouveau',
-'insert new %s': 'insérer un nouveau %s',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
+'Insufficient privileges': 'Insufficient privileges',
 'Internal State': 'État interne',
-'Introduction': 'Introduction',
-'Invalid email': 'E-mail invalide',
+'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',
-'Is Active': 'Est actif',
+'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': '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': 'Chat en direct',
-'Log In': 'Log In',
-'login': 'connectez-vous',
-'Login': 'Connectez-vous',
-'logout': 'déconnectez-vous',
-'lost password': 'mot de passe perdu',
+'Live Chat': 'Clavardage en direct',
+'Log In': 'Connexion',
+'Logged in': 'Connecté',
+'Logged out': 'Logged out',
+'Login': 'Connexion',
+'Login disabled by administrator': 'Login disabled by administrator',
+'Logout': 'Logout',
 'Lost Password': 'Mot de passe perdu',
-'Lost password?': 'Mot de passe perdu?',
-'lost password?': 'mot de passe perdu?',
-'Main Menu': 'Menu principal',
+'Lost your password?': 'Lost your password?',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',
 'Manage Cache': 'Gérer le Cache',
 'Memberships': 'Memberships',
 'Menu Model': 'Menu modèle',
-'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 100 rows': '100 prochaines lignes',
+'next %s rows': '%s prochaine 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 Recipes': 'Autres recettes',
 'Overview': 'Présentation',
 '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 100 rows': '100 lignes précédentes',
+'previous %s rows': '%s lignes précédentes',
+'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 d'enregistrement",
+'Record id': "id de l'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',
-'Size of cache:': 'Taille du cache:',
+'Sign Up': "S'inscrire",
+'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',
-'Sure you want to delete this object?': 'Êtes-vous sûr de vouloir supprimer cet objet?',
+'Support': 'Soutien',
 'Table': 'tableau',
-'Table name': 'Nom du tableau',
 '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.champ1==\'valeur\'". Quelque chose comme "db.table1.champ1==db.table2.champ2" résulte en un JOIN SQL.',
 'The Core': 'Le noyau',
 '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 is a copy of the scaffolding application': "Ceci est une copie de l'application échafaudage",
+'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)': '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 %s': 'Bienvenue %s',
-'Welcome to web2py': 'Bienvenue à 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 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,18 +13,30 @@
 '**%(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',
-'Administrative Interface': 'Administrative Interface',
-'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",
 'cache': 'cache',
 'Cache': 'Cache',
@@ -33,11 +45,13 @@
 'Cache Keys': 'Cache Keys',
 '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',
@@ -46,7 +60,6 @@
 'Current request': 'वर्तमान अनुरोध',
 'Current response': 'वर्तमान प्रतिक्रिया',
 'Current session': 'वर्तमान सेशन',
-'customize me!': 'मुझे अनुकूलित (कस्टमाइज़) करें!',
 'data uploaded': 'डाटा अपलोड सम्पन्न ',
 'Database': 'डेटाबेस',
 'Database %s select': 'डेटाबेस  %s चुनी हुई',
@@ -56,6 +69,7 @@
 'Delete:': 'मिटाना:',
 'Demo': 'Demo',
 'Deployment Recipes': 'Deployment Recipes',
+'Description': 'Description',
 'design': 'रचना करें',
 'Design': 'Design',
 'DISK': 'DISK',
@@ -66,20 +80,26 @@
 "Don't know what to do?": "Don't know what to do?",
 'done!': 'हो गया!',
 'Download': 'Download',
-'Edit': 'Edit',
+'E-mail': 'E-mail',
 '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',
 'Helping web2py': 'Helping 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)})',
@@ -87,50 +107,68 @@
 'How did you get here?': 'How did you get here?',
 'import': 'import',
 'Import/Export': 'आयात / निर्यात',
-'Index': 'Index',
-'insert new': 'नया डालें',
-'insert new %s': 'नया   %s  डालें',
+'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
+'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',
-'login': 'login',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'Login': 'लॉग इन',
-'logout': 'logout',
+'Login disabled by administrator': 'Login disabled by administrator',
 'Logout': 'लॉग आउट',
 'Lost Password': 'पासवर्ड खो गया',
-'Main Menu': 'Main Menu',
+'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 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 फ़ाइल से आयात',
-'Other Plugins': 'Other Plugins',
+'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',
-'previous 100 rows': 'पिछले 100 पंक्तियाँ',
+'Profile': 'Profile',
+'Profile updated': 'Profile updated',
 'pygraphviz library not found': 'pygraphviz library not found',
 'Python': 'Python',
 'Query:': 'प्रश्न:',
@@ -141,47 +179,88 @@
 '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': 'तालिका में पंक्तियाँ ',
 'Rows selected': 'चयनित (चुने गये) पंक्तियाँ ',
 'Save model as...': 'Save model as...',
-'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': 'तालिका',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
 'The Core': 'The Core',
 '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 %s': 'Welcome %s',
-'Welcome to web2py': 'वेब२पाइ (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 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',
 }